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