Merge branch 'pw/rebase-abort-clean-rewritten' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"