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