Am 9/20/2010 10:28, schrieb Elijah Newren: > -test_expect_code 1 'Merge with d/f conflicts' 'git merge "merge msg" B master' > +test_expect_success 'Merge with d/f conflicts' ' > + test_must_fail git merge master > +' The old version requested a particular kind of failure. Are you saying that with modern 'git merge' all non-zero exit codes mean the same kind of failure? -- Hannes -- 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