[Gnu-arch-users] Graphical merges

[Matthieu Moy]

Hi all,

I'm trying  to set  up a prototype  of graphical  conflicts resolution
tool using ediff mode in Emacs. 

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.

I'd like  to go  further, and  call ediff3 to  compare MINE,  HIS, and
ANCESTOR. 

Problem: In tla, the call to diff3 hardcodes the option '-E'. 

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 ?

-- 
Matthieu