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

I apparently just needed to hg update -C -r 3, which overwrites my local files with the rev in mind (which is what I thought hg update would do; but I was wrong.) Thanks for my help!