From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Mon, 28 May 2012 08:43:31 GMT
Subject: Re: [PATCHv2 2/2] t7512-status-warnings.sh: better advices for git status
Message-ID: <vpqaa0shf0s.fsf@bauges.imag.fr>
In-Reply-To: <1338035905-24166-2-git-send-email-Lucien.Kong@ensimag.imag.fr>

Kong Lucien <Lucien.Kong@ensimag.imag.fr> writes:

> +test_expect_success 'status when conflicts unresolved' '
> +	git init --shared --bare conflict_test.git &&
> +	git clone conflict_test.git test1 &&
> +	git clone conflict_test.git test2 &&

I already asked off-list, but why do you need 3 repositories here.
Wouldn't it be simpler to have 2 branches and test conflicts with
"git merge"?

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/