Merge branch 'jk/path-name-safety-2.4' into maint-2.4
[alt-git.git] / mergetools / gvimdiff3
blob04a5bb0ea8484244e420ef13072773623c5b0366
1 . "$MERGE_TOOLS_DIR/vimdiff"