![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 22 Jun 2008 09:03:26 +0000 (02:03 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 22 Jun 2008 09:03:26 +0000 (02:03 -0700) | ||
| commit | 7f8365f894d60f240edd356f32e3c1bda994ed41 | |
| tree | c9e58c23437b9ccd51da537ba86298b99d0181a8 | tree | snapshot |
| parent | 51e0d0a67b8d31e92d52e15b577afb079359ec63 | commit | 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.
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 |