projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 335c6e4) | patch
t/t2023-checkout-m.sh: fix use of test_must_fail
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Tue, 20 Dec 2011 20:37:45 +0000 (20:37 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 21:24:02 +0000 (13:24 -0800)
commit5cd7fadc076880c48a27fd4e5e70844f127ceb99
tree7b67fe26289c9c441b468889d3a99314fe86ce39tree | snapshot
parent335c6e403d862913846661638af6e184055f6db5commit | diff
t/t2023-checkout-m.sh: fix use of test_must_fail

Change an invocation of test_must_fail() to be inside a
test_expect_success() as is our usual pattern. Having it outside
caused our tests to fail under prove(1) since we wouldn't print a
newline before TAP output:

    CONFLICT (content): Merge conflict in both.txt
    # GETTEXT POISON #ok 2 - -m restores 2-way conflicted+resolved file

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t2023-checkout-m.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.