mergetools / vimdiff3on commit Merge branch 'pt/enter-repo-comment-fix' into maint (42b2f89)
   1. "$MERGE_TOOLS_DIR/vimdiff"