Tree: 8482d042a0

Commit Graph

2 Commits (8482d042a016aaae1e564f9c34b4d5f6b59794be)

Author	SHA1	Message	Date
Ævar Arnfjörð Bjarmason	5cd7fadc07	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>	13 years ago
Pete Harlan	3d0b05176f	Test 'checkout -m -- path' ... Signed-off-by: Pete Harlan <pgit@pcharlan.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	13 years ago