[darcs-devel] [issue221] Problem resolving confilicts

[Noam Goldberg]

New submission from Noam Goldberg <ngoldberg at rutcor.rutgers.edu>:

The following is the output of exact-version and resolve.
Let me know if you need any additional files.
Thank you in advance,
Noam

research% darcs --exact-version
darcs compiled on Mar  4 2006, at 21:34:19
# configured Tue Feb 28 07:02:39 EST 2006
./configure --no-create --no-recursion

Context:

[TAG 1.0.6
Tommy Pettersson <ptp at lysator.liu.se>**20060228111841] 

research% darcs resolve
darcs: bug in darcs!
Problem resolving conflicts in resolve!user error (Error applying hunk to file ./LAD_Boost.tex)
Please report this to bugs at darcs.net,
If possible include the output of 'darcs --exact-version'.

----------
files: unnamed
messages: 799
nosy: droundy, ngoldberg, tommy
status: unread
title: Problem resolving confilicts

____________________________________
Darcs issue tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue221>
____________________________________
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.osuosl.org/pipermail/darcs-devel/attachments/20060708/a59bd1fb/unnamed.htm