From: Abhijit Menon-Sen Date: Mon, 01 Sep 2008 09:50:09 GMT Subject: Re: [PATCH 00/12] Towards a better merge resolution support Message-ID: <20080901095008.GB6555@toroid.org> In-Reply-To: <20080901094412.GB3993@blimp.local> At 2008-09-01 11:44:12 +0200, raa.lkml@gmail.com wrote: > > IOW, copy the commit resolution from some other merge commit. Maybe > can be a way to use rerere mechanism with that? That's what I'm trying to implement on Dscho's suggestion. I'm still just trying to understand the code, so any suggestions about how to do this are very welcome. -- ams