Oct 11, 2010

Resolving merge conflicts in mercurial

In case of a merge conflict, mercurial gives some hint about it.
You can view the state with the command:

hg resolve -l
If you've resolved a conflict, you have to tell mercurial about this fact:

hg resolve -m file/which/is/resovled