Subject: Re: [PATCH 09/37] t6020: Modernize style a bit

From: Johannes Sixt <[email-masked]>
Date: Mon, 20 Sep 2010 11:24:09 +0200

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