diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-12-20 20:37:45 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-20 13:24:02 -0800 |
| commit | 5cd7fadc076880c48a27fd4e5e70844f127ceb99 (patch) | |
| tree | 7b67fe26289c9c441b468889d3a99314fe86ce39 /bundle.h | |
| parent | 335c6e403d862913846661638af6e184055f6db5 (diff) | |
| download | git-jc/checkout-m-twoway.tar.gz | |
t/t2023-checkout-m.sh: fix use of test_must_failjc/checkout-m-twoway
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>
Diffstat (limited to 'bundle.h')
0 files changed, 0 insertions, 0 deletions