mergetools / vimdiff3on commit Merge branch 'pw/rebase-abort-clean-rewritten' into maint (649cae6)
   1. "$MERGE_TOOLS_DIR/vimdiff"