[Gnu-arch-users] Re: Graphical merges

[Stefan Monnier]

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


        Stefan