mergetools / vimdiff3on commit Merge branch 'jk/cleanup-failed-clone' into maint (73d8bfd)
   1. "$MERGE_TOOLS_DIR/vimdiff"