Junio C Hamano wrote: > Elijah Newren <newren@xxxxxxxxx> writes: >> --- a/t/t1001-read-tree-m-2way.sh >> +++ b/t/t1001-read-tree-m-2way.sh >> @@ -98,8 +98,8 @@ test_expect_success \ >> git checkout-index -u -f -q -a && >> git update-index --add yomin && >> read_tree_twoway $treeH $treeM && >> - git ls-files --stage >4.out || return 1 >> - git diff --no-index M.out 4.out >4diff.out >> + git ls-files --stage >4.out && >> + test_might_fail git diff --no-index M.out 4.out >4diff.out && > > Shouldn't this be must-fail, as we are expecting to see some differences? I see you've fixed this up already. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html