Merge branch 'nd/git-dir-pointing-at-gitfile'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"