Re: [PATCHv2 2/2] t7512-status-warnings.sh: better advices for git status
From: Matthieu Moy <hidden>
Date: 2016-06-15 22:53:55
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 &&
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/