[Top][All Lists]

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

[Gnu-arch-users] Graphical merges

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

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

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 ?


reply via email to

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