From: Jakub Narebski <jnareb@gmail.com>
Date: Wed, 13 Sep 2006 21:54:23 GMT
Subject: Re: [RFC] Merge strategy 'applyreject'
Message-ID: <ee9ult$mtn$1@sea.gmane.org>
In-Reply-To: <20060913215043.GE30782@spearce.org>

Shawn Pearce wrote:

> But I don't really want this as a merge strategy in its own right.
> I want it as part of merge-recur (...)

Wouldn't it be better to have pluggable way to deal with conflicts,
be it diff3/merge with conflict markers, .rej files, or invoking
graphical merge tool (vimdiff, Emacs Emerge, xxdiff, Meld, KDiff3)?

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git