mergetools / vimdiff2on commit Merge branch 'jk/drop-sha1-entry-pos' (caa25f7)
   1. "$MERGE_TOOLS_DIR/vimdiff"