Merge branch 'ft/diff-rename-default-score-is-half' into maint
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"