Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/merge.py
changeset 30961 330fbd515512
parent 30903 dd995a5db8fd
child 31158 58f55f0b40dc 
--- a/mercurial/merge.py	Wed Feb 15 14:49:33 2017 +0800
+++ b/mercurial/merge.py	Thu Feb 09 09:52:32 2017 -0800
@@ -1562,7 +1562,7 @@
                     else:
                         msg = _("uncommitted changes")
                         hint = _("commit or update --clean to discard changes")
-                        raise error.Abort(msg, hint=hint)
+                        raise error.UpdateAbort(msg, hint=hint)
                 else:
                     # Allow jumping branches if clean and specific rev given
                     pass
mercurial