mergetools / vimdiff2on commit Merge branch 'jk/make-findstring-makeflags-fix' into maint (47c566a)
   1. "$MERGE_TOOLS_DIR/vimdiff"