The behaviour is this: When darcs applies a conflicting patch, the resulting state of /pristine/ ignores the conflict. The state of the working directory depends on some flags:
--mark-conflicts (which is I believe the default) causes darcs resolve to be called, and the conflicts are marked. --allow-conflicts does not mark the conflicts and modifies working and pristine in the same way. These's also --dont-allow-conflicts, which refuses to apply the patches. Thus manually calling darcs resolve is useful in two situations: either the user selected --allow-conflicts, and now wants those conflicts marked, or the user has reverted the conflict markers and now wants them put back. -- Jamie Webb _______________________________________________ darcs-users mailing list darcs-users@darcs.net http://www.abridgegame.org/mailman/listinfo/darcs-users
