Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5
[git/mingw.git] / mergetools / gvimdiff
blob04a5bb0ea8484244e420ef13072773623c5b0366
1 . "$MERGE_TOOLS_DIR/vimdiff"