From: Johannes Schindelin Date: Sun, 10 Aug 2008 23:12:13 GMT Subject: Re: [PATCH] Make cherry-pick use rerere for conflict resolution. Message-ID: In-Reply-To: <1218368935-31124-1-git-send-email-ams@toroid.org> Hi, On Sun, 10 Aug 2008, Abhijit Menon-Sen wrote: > Trivial change plus test, as requested by Johannes Schindelin. I would have preferred some convincing rationale for the change instead. Ciao, Dscho