Merge branch 'jk/git-no-more-argv0-path-munging'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"