[Top][All Lists]

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

[Gnu-arch-users] Re: Graphical merges

From: Stefan Monnier
Subject: [Gnu-arch-users] Re: Graphical merges
Date: 21 Apr 2004 13:36:48 -0400
User-agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50

> 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.

> Solution:  In  function run_diff3,  in  apply-changeset.c, change  the
> hardcoded '-E' for an optional one. Add an option '--view-ancestor' to
> tla star-merge to disable the '-E' option to patch.
> Does this seem reasonable ?

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"
(i.e. what's currently used).


reply via email to

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