From: Johannes Sixt <j.sixt@viscovery.net>
Date: Tue, 08 Jun 2010 11:58:29 GMT
Subject: Re: [PATCH] merge-recursive: demonstrate an incorrect conflict with submodule
Message-ID: <4C0E3065.5070401@viscovery.net>
In-Reply-To: <4C0E2AB4.2010008@viscovery.net>

Am 6/8/2010 13:34, schrieb Johannes Sixt:
> +test_expect_failure 'merge-recursive simple w/submodule result' '
> +
> +	git ls-files -s >actual &&
> +	(
> +		echo "100644 $o5 0	a"
> +		echo "100644 $o0 0	c"
> +		echo "100644 $c1 0	d"

Make this line
		echo "160000 $c1 0	d"
Sorry!

> +	) >expected &&
> +	test_cmp expected actual

-- Hannes