diff -r e4492d55fb66 -r 330fbd515512 mercurial/merge.py
--- 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