Merge branch 'pe/pull-rebase-v-q' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"