mergetools / gvimdiff2on commit t3510: stop using '-m 1' to force failure mid-sequence of cherry-picks (c812bd4)
   1. "$MERGE_TOOLS_DIR/vimdiff"