[darcs-users] Conflict marking
Richard A. Smith
rsmith at bitworks-inc.com
Wed Sep 28 14:42:13 UTC 2005
As a result of my playing with my messed up repo. I've had patches
generate conflicts.
Perhaps I just don't have the right options set but when darcs marks a
conflict I get something close to the following.
V V V V V V
Version 1
***********
Version 2
^ ^ ^ ^ ^ ^
What I don't like is that there is no indication of which version is the
orginal an which is the conflicting change. It would be much better if
it _clearly_ marked what block of code is what.
--
Richard A. Smith
Bitworks, Inc
More information about the darcs-users
mailing list