Merge branch 'dt/name-hash-dir-entry-fix' into maint
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"