[darcs-users] conflict but no markers

[Guillaume Hoffmann]

HI,

> Three of these files actually contain conflict markers, but the third one
> (./src/seq/seq_if.c) does not. Even so, most of the changes that I expected
> to see in the file are not there, so it seems Darcs acted as if I had said
> --no-mark-conflicts.


Could it be that the conflict with ./src/seq/seq_if.c be not a hunk
conflict but a move, delete, whatever conflict?
This may explain why there are no markers.

Guillaume