[darcs-devel] [issue2550] conflict resolution for non-hunks is rotten

Ben Franksen bugs at darcs.net
Thu Apr 19 06:41:10 UTC 2018


Ben Franksen <ben.franksen at online.de> added the comment:

This is probably best deferred until we have a new patch format (with
camp-style conflictors); the calculation of conflict resolution markup
is pretty messy and we probably have to re-write it anyway.

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue2550>
__________________________________


More information about the darcs-devel mailing list