Guillaume Hoffmann <guillaumh at gmail.com> added the comment: Relevant: http://hub.darcs.net/ganesh/darcs-conflict-marking __________________________________ Darcs bug tracker <bugs at darcs.net> <http://bugs.darcs.net/issue1911> __________________________________