mergetools / vimdiff3on commit t3510: test that cherry-pick --abort does not unsafely change HEAD (aeebd98)
   1. "$MERGE_TOOLS_DIR/vimdiff"