diff options
| author |  Elijah Newren <newren@gmail.com> | 2010-09-20 02:28:44 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:32:37 -0700 |
| commit | c976260d0f3d3f99dc3594e3f98436bfd920dc97 (patch) | |
| tree | 954c085342faae21fde61dd6c9e73c23134bbf95 /templates/hooks--applypatch-msg.sample | |
| parent | t6020: Add a testcase for modify/delete + directory/file conflict (diff) | |
| download | tgif-c976260d0f3d3f99dc3594e3f98436bfd920dc97.tar.xz | |
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>
Diffstat (limited to 'templates/hooks--applypatch-msg.sample')
0 files changed, 0 insertions, 0 deletions