development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 10:45:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
36644 commits 6 branches 951 tags 697 MiB
Commit graph

2 commits

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>
 2011-12-20 13:24:02 -08:00
Pete Harlan 3d0b05176f Test 'checkout -m -- path' 
Signed-off-by: Pete Harlan <pgit@pcharlan.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-11 21:26:57 -08:00