[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Gnu-arch-users] Re: Graphical merges

From: Matthieu Moy
Subject: Re: [Gnu-arch-users] Re: Graphical merges
Date: Wed, 21 Apr 2004 21:21:27 +0200
User-agent: Gnus/5.1002 (Gnus v5.10.2) Emacs/21.2 (gnu/linux)

Stefan Monnier <address@hidden> writes:

>> A view of the differences between MINE and HIS won't be too difficult,
>> since I just have to parse the conflicts marks in the source file, and
>> call ediff.
> It's called `smerge-ediff' in Emacs-21.

Oh, great ! 

Why to I always learn the existence of those tools too late? ;-)

> I'd much prefer to have even more control over flags passed to diff3.
> Like an option "--diff3-flag <flags>" which would default to "-E -m"

Seems a better alternative to my proposal. 

The solution  of splitting  tla star-merge is  probably better  in the
long term, anyway.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]