mergetools / vimdiff2on commit Merge branch 'jk/commit-how-to-abort-cherry-pick' (af77c0b)
   1. "$MERGE_TOOLS_DIR/vimdiff"