mergetools / vimdiff3on commit Merge branch 'so/rebase-doc' into maint (e7867e8)
   1. "$MERGE_TOOLS_DIR/vimdiff"