mergetools / vimdiff3on commit Merge branch 'ss/pull-rebase-preserve' into maint (ad00aeb)
   1. "$MERGE_TOOLS_DIR/vimdiff"