Merge branch 'jk/sha1-file-reduce-useless-warnings'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"