projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 51e0d0a) | patch
t4200: fix rerere test
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Jun 2008 09:03:26 +0000 (02:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Jun 2008 09:03:26 +0000 (02:03 -0700)
commit7f8365f894d60f240edd356f32e3c1bda994ed41
treec9e58c23437b9ccd51da537ba86298b99d0181a8tree | snapshot
parent51e0d0a67b8d31e92d52e15b577afb079359ec63commit | diff
t4200: fix rerere test

The test used "diff-files -q" which is not about reporting if there is
a difference at all.  Instead, make sure that the path remains as
conflicting in the index after rerere autoresolves it, as we will be
adding rerere.autoupdate configuration with the next patch.
t/t4200-rerere.sh diff | blob | history
Git—the stupid content tracker