![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 22 Jun 2008 07:21:28 +0000 (00:21 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 22 Jun 2008 07:54:40 +0000 (00:54 -0700) | ||
| commit | a1b32fdc3d1d05395f186bfa06e92174519dab8d | |
| tree | 5ba298aaacd597fce76562b6b0ff23b22c03c52f | tree | snapshot |
| parent | 9022a495a3c407859560d4ac4a278c0d6ad58837 | commit | diff |
git-rerere: detect unparsable conflicts
rerere did not detect the case where <<< === >>> markers did not match.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
rerere did not detect the case where <<< === >>> markers did not match.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-rerere.c | diff | blob | history |