Merge branch 'jc/maint-pull-docfix-for-409b8d82' into jc/maint-pull-docfix
[git/mingw/j6t.git] / mergetools / gvimdiff
blob04a5bb0ea8484244e420ef13072773623c5b0366
1 . "$MERGE_TOOLS_DIR/vimdiff"