[Monotone-devel] Re: merge failure

[Peter Simons]

[Sorry for the long delay in answering this!]

graydon hoare writes:

 >> | monotone: conflict: file sets 'left dels' and 'right move sources' 
 >> intersect

 > could you describe the changes you made to get here?

Unfortunately not. I synchronized branches hence and forth
quite wildly. :-) I'll keep an eye open for this and let you
know if I hit the error message again.

Peter