[darcs-users] configuring merge tool

[Ivan Djordjevic]

Hi,
I get following error while trying to push a patch from one repo to another.

Merging file ./bh/units/aab/rtl/aab.v by hand.
Running command 'xxdiff -m -O -M /tmp/merged/./bh/units/aab/rtl/aab.v
/tmp/version1/./bh/units/aab/rtl/aab.v
/tmp/ancestor/./bh/units/aab/rtl/aab.v
/tmp/version2/./bh/units/aab/rtl/aab.v'
External merge command exited with ExitFailure 1
Hit return to move on...darcs: <stdin>: hGetLine: end of file

 I tried the xxdiff and the emacs tools as described in
http://www.darcs.net/manual/node7.html but no success. Has anybody seen this
and has a remedy?

darcs version:

darcs --exact-version
darcs compiled on Jul 18 2006, at 15:08:59
# configured Tue Jul 18 15:03:25 JST 2006
./configure --with-static-libs

Context:

[TAG 1.0.8
Tommy Pettersson <ptp at lysator.liu.se>**20060616160213]



-Ivan
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.osuosl.org/pipermail/darcs-users/attachments/20070308/4e22f1e1/attachment.htm