Re: [PATCH/RFC] t7512-status-warnings.sh : better advices for git status

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

Kong Lucien [off-list ref] 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/