What does "darcs resolve" do? Does it do anything? Could what it does be documented in the darcs manual? I just had a problem where a darcs newbie that I am working with tried running "darcs resolve" because he saw that he had a conflict. That wasn't what he meant to do! --Z