# That is actually the correct response. When a conflict occurs in a # repository no changes are made to the working copy.
Yes changes are made to the working copy # darcs resolve marks # up the file that had conflicts with the potential conflicting versions # like so: # # vvvvvvvvvv # This is one possibility for the conflict. # ---------- # This is another possibility for the conflict. # ^^^^^^^^^^ # That happens all by itself, without needing to call darcs resolve. -- Clive Crous http://www.darkarts.co.za/ _______________________________________________ darcs-users mailing list darcs-users@darcs.net http://www.abridgegame.org/mailman/listinfo/darcs-users
