From: Elijah Newren <newren@gmail.com>
Date: Mon, 20 Sep 2010 08:28:44 +0000 (-0600)
Subject: t6036: Test index and worktree state, not just that merge fails
X-Git-Tag: v1.7.4-rc0~101^2~28
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c976260d0f3d3f99dc3594e3f98436bfd920dc97?ds=inline;hp=c976260d0f3d3f99dc3594e3f98436bfd920dc97

t6036: Test index and worktree state, not just that merge fails

c94736a (merge-recursive: don't segfault while handling rename clashes
2009-07-30) added this testcase with an interesting corner case test,
which previously had cased git to segfault.  This test ensures that the
segfault does not return and that the merge correctly fails; just add
some checks that verify the state of the index and worktree after the merge
are correct.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---