On Sun, Oct 3, 2010 at 7:47 AM, Jonathan Nieder <jrnieder@xxxxxxxxx> wrote: >> @@ -145,20 +122,14 @@ test_expect_success 'check honors conflict marker length' ' >> Â Â Â git reset --hard && >> Â Â Â echo ">>>>>>> boo" >>b && >> Â Â Â echo "======" >>a && >> - Â Â git diff --check a && >> - Â Â ( >> - Â Â Â Â Â Â git diff --check b >> - Â Â Â Â Â Â test $? = 2 >> - Â Â ) && >> + Â Â git diff --check a >> + Â Â test_expect_code 2 git diff --check b && > > Missing &&? Indeed -- that's pretty embarrassing, considering the topic of the series. :-/ Good catch. > With that exception, > Reviewed-by: Jonathan Nieder <jrnieder@xxxxxxxxx> 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