darcs

Message799

Author ngoldberg
Recipients droundy, ngoldberg, tommy
Date 2006-07-08.15:52:04
Issue Issue221 mark-conflicts => Problem resolving conflicts in resolve! (1.0.9)
Content
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@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@darcs.net,
If possible include the output of 'darcs --exact-version'.
Files
File name Uploaded
unnamed ngoldberg, 2006-07-08.15:52:04
History
Date User Action Args
2006-07-08 15:52:04ngoldbergcreate
2006-07-08 15:52:06ngoldberglinkissue221 messages
2006-07-08 15:52:07ngoldbergsetrecipients: + ngoldberg, droundy, tommy