Merge branch 'jx/branch-vv-always-compare-with-upstream'
[git/mingw.git] / mergetools / gvimdiff
blob04a5bb0ea8484244e420ef13072773623c5b0366
1 . "$MERGE_TOOLS_DIR/vimdiff"