revert conflict without losing non-committed changes

anatoly techtonik techtonik at gmail.com
Sat Aug 2 11:46:50 UTC 2014


  $ 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?
-- 
anatoly t.



More information about the Mercurial mailing list