Merge branch 'sg/diff-multiple-identical-renames' into maint
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"