![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 28 Feb 2011 05:58:30 +0000 (21:58 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 28 Feb 2011 05:58:30 +0000 (21:58 -0800) |
* mz/rerere-remaining:
mergetool: don't skip modify/remove conflicts
rerere "remaining"
mergetool: don't skip modify/remove conflicts
rerere "remaining"
Trivial merge