Merge branch 'sb/sha1-file-cleanup' into maint
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"