Re: [PATCH] xdl_merge(): fix and simplify conflict handling

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Dec 5, 2006, 22:24 UTC
Message-ID: <Pine.LNX.4.63.0612052320320.28348@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <7vvekqf0yh.fsf@assigned-by-dhcp.cox.net>

Hi,

On Tue, 5 Dec 2006, Junio C Hamano wrote:

> Looking at some other cases after applying your patch, I noticed that I 
> really like one thing that your version does over what RCS merge does.

Gee, thanks!

Actually, this was what I intended to do first when somebody submitted a builtin merge: Be clever about what is a conflict and what not.

Speaking about a builtin merge: I like the fact that git-apply also works outside of git repositories. It makes life easier to have a sane patcher around.

Now, I'd like the same with git-diff, and an RCS merge replacement... Of course, what with all those porcelainish commands we should not add new commands, but enhance existing ones. Any ideas which ones?

Ciao, Dscho