Merge branch 'sb/hex-object-name-is-at-most-41-bytes-long' into maint
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"