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

To undo an uncommitted merge, use

hg update --clean

which will check out a clean copy of the original merge parent, losing all changes.