From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Aug 2008 23:40:09 +0000 (-0700)
Subject: Merge branch 'am/cherry-pick-rerere'
X-Git-Tag: v1.6.1-rc1~296
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=88ab18dfef55a41df2e1f69a8ab3e3ed9f915c31;p=git.git

Merge branch 'am/cherry-pick-rerere'

* am/cherry-pick-rerere:
  Make cherry-pick use rerere for conflict resolution.
---

88ab18dfef55a41df2e1f69a8ab3e3ed9f915c31