mergetools / vimdiff2on commit Merge branch 'jk/grep-binary-workaround-in-test' into maint (7f18fad)
   1. "$MERGE_TOOLS_DIR/vimdiff"