--- a/mercurial/commands.py	Mon Oct 05 21:42:09 2015 -0700
+++ b/mercurial/commands.py	Mon Oct 05 04:26:26 2015 -0700
@@ -5196,7 +5196,7 @@
                 updata =  destutil.destupdate(repo)
                 checkout, movemarkfrom, brev = updata
             ret = hg.update(repo, checkout)
-        except error.Abort as inst:
+        except error.UpdateAbort as inst:
             ui.warn(_("not updating: %s\n") % str(inst))
             if inst.hint:
                 ui.warn(_("(%s)\n") % inst.hint)