![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 15 Jul 2008 06:47:14 +0000 (23:47 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 15 Jul 2008 06:47:14 +0000 (23:47 -0700) |
* om/rerere-careful:
builtin-rerere: more carefully find conflict markers
builtin-rerere: more carefully find conflict markers
Trivial merge