Merge branch 'jk/revision-o-is-in-libgit-a'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"