revert conflict without losing non-committed changes

[Benjamin Fritz]

On Sat, Aug 2, 2014 at 6:46 AM, anatoly techtonik <techtonik at gmail.com> wrote:
>   $ hg up default
>   merging spyderlib/spyder.py
>   merging spyderlib/spyder.py failed!
>   0 files updated, 0 files merged, 1 files removed, 1 files unresolved
>   use 'hg resolve' to retry unresolved file merges
>
> Damn, I don't want to resolve anything. Is there any
> way to get back and understand what will happen
> with my files exactly?

I don't know how to go about fixing your problem after you already did
the merge.

But normally I'll commit before doing an update to avoid this
situation entirely. If I need to I'll just merge after the update.

If you want to make history clean without a bunch of merges you can
always rebase after you update instead of merging.