![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Aug 2008 23:40:09 +0000 (16:40 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Aug 2008 23:40:09 +0000 (16:40 -0700) |
* am/cherry-pick-rerere:
Make cherry-pick use rerere for conflict resolution.
Make cherry-pick use rerere for conflict resolution.
Trivial merge