How to abandon a hg merge?

Question

I\'m new to collaborating with Mercurial. My situation:

• Another programmer changed rev 1 of a file to replace 4-space indents with 2-space indent. (I.e. change

Answer 1

BTW: if you just revert the merge you did and 3 is not your revision number you can do this:

hg update -C -r .