[darcs-users] starting merge program in case of a conflict

Gour darcs_users at atmarama.org
Thu Apr 14 15:15:29 UTC 2005


Christoph Wegscheider (wegi at despammed.com) wrote:

> Hi,
> what I really dislike in darcs is it's conflict handling. Instead of
> marking the conflict in the file it should start a user defined program
> (configurable of course) as vimdiff, meld, whatever and let the user
> resolve the conflict manually. 

This is from the darcs manual:

<quote>
Resolution of conflicts 
To resolve conflicts using an external tool, you need to specify a
command to use, e.g. 
--external-merge 'opendiff %1 %2 -ancestor %a -merge %o'.

The %1 and %2 are replaced with the two versions to be merged, %a is
replaced with the common ancestor of the two version. Most importantly,
%o is replaced with the name of the output file that darcs will require
%to be created holding the merged version. The above example works with
%the FileMerge.app tool that comes with Apple's developer tools. To use
%xxdiff, you would use 
--external-merge 'xxdiff -m -O -M %o %1 %a %2'

To use kdiff3, you can use 
--external-merge 'kdiff3 --output %o %a %1 %2'
</quote>

I use it with kdiff3.

Sincerely,
Gour

-- 
Registered Linux User	| #278493
GPG Public Key		| 8C44EDCD
 




More information about the darcs-users mailing list