Merge branch 'jk/common-main' into maint-2.10
[git/git-svn.git] / mergetools / gvimdiff
blob04a5bb0ea8484244e420ef13072773623c5b0366
1 . "$MERGE_TOOLS_DIR/vimdiff"