mergetools / vimdiff2on commit t: use test_might_fail for diff and grep (35da1bf)
   1. "$MERGE_TOOLS_DIR/vimdiff"