Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"