From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Thu, 24 May 2012 17:31:33 GMT
Subject: Re: [PATCH/RFC] t7512-status-warnings.sh : better advices for git status
Message-ID: <vpqpq9t32q2.fsf@bauges.imag.fr>
In-Reply-To: <1337852264-32619-1-git-send-email-Lucien.Kong@ensimag.imag.fr>

(We met off-list and already did a few fixes, but here are a few more)

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 &&

You don't need to clone to get conflicts. Just create local branches and
use "git merge".

> +test_expect_success 'status when conflicts resolved before commit' '
> +	echo toto > main.txt &&

"toto" would usually be "foo" in english ;-).

We usually write >main, not > main.

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