[darcs-devel] [issue2114] behavior of darcs pull --allow-conflicts is not documented

[Mark Stosberg]

Mark Stosberg <mark at summersault.com> added the comment:

>From a test, it appears the behavior is the same as pulling with conflict 
markers, and then doing a revert -a. I believe this means that conflicts 
are resolved in the favor of the changes being pulled in.

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