From: Caleb Cushing Date: Wed, 03 Dec 2008 22:59:56 GMT Subject: Re: more merge strategies : feature request Message-ID: <81bfc67a0812031459g4c30908ew46e4cf2bd6445f64@mail.gmail.com> In-Reply-To: <20081204062717.6117@nanako3.lavabit.com> > Isn't what Caleb wants "-X ours/theirs" per-hunk option for merge strategy backends? just from this description it sounds like it. I can't say anything about that patch, but to me having such a strategy only makes sense. -- Caleb Cushing