mergetools / vimdiff2on commit Merge branch 'tr/maint-apply-non-git-patch-parsefix' into maint (90360c7)
   1. "$MERGE_TOOLS_DIR/vimdiff"