diff options
| author | Elijah Newren <newren@gmail.com> | 2018-08-03 16:09:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-06 08:17:40 -0700 |
| commit | 69885ab0157ed41b1844baaaa5c91ed28941877b (patch) | |
| tree | 153f613dade4a4f829458ed0a33745f6f1844553 /t/t3031-merge-criscross.sh | |
| parent | d33c87517a85f544159b2efa406136dde18a5b9f (diff) | |
| download | git-69885ab0157ed41b1844baaaa5c91ed28941877b.tar.gz | |
t3031: update test description to mention desired behavior
This test description looks like it was written with the originally
observed behavior ("causes segfault") rather than the desired and now
current behavior ("does not cause segfault"). Fix it.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3031-merge-criscross.sh')
| -rwxr-xr-x | t/t3031-merge-criscross.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3031-merge-criscross.sh b/t/t3031-merge-criscross.sh index e59b0a32d6..3824756a02 100755 --- a/t/t3031-merge-criscross.sh +++ b/t/t3031-merge-criscross.sh @@ -88,7 +88,7 @@ test_expect_success 'setup repo with criss-cross history' ' git branch G ' -test_expect_success 'recursive merge between F and G, causes segfault' ' +test_expect_success 'recursive merge between F and G does not cause segfault' ' git merge F ' |