[darcs-users] configuring merge tool

[Tim Barbour]

Hi Ivan,

I noticed your post on the darcs users list. I have also been having problems
using xxdiff with darcs, specifically I get complaints like:

  External merge command exited with ExitFailure 1

(I have no idea about the "darcs: <stdin>: hGetLine: end of file").

After reading `xxdiff --help`, it seems the complaint is caused by xxdiff
returning the exit status from diff, rather than from the merge. The -X option
tells xxdiff to return the merge status instead, so this entry in
_darcs/prefs/defaults works for me:

  ALL external-merge xxdiff -m -O -X -M %o %1 %a %2

I think the xxdiff setup in the darcs manual is wrong (it never worked for me),
and should be changed to include the "-X" option.

Tim