[darcs-users] Does rollback resolve merge conflicts?

[Juliusz Chroboczek]

Given a pairwise merge conflict (between just two patches) does
rolling back one of the two resolve the conflict?

                                        Juliusz