mergetools / vimdiff2on commit Merge branch 'es/rebase-i-no-abbrev' (135be1e)
   1. "$MERGE_TOOLS_DIR/vimdiff"