New upstream version 4.7

1 files changed, 1 insertions, 2 deletions

diff --git a/tortoisehg/hgqt/bisect.py b/tortoisehg/hgqt/bisect.py
index aaa9f1f..ae4f67e 100644
--- a/tortoisehg/hgqt/bisect.py
+++ b/tortoisehg/hgqt/bisect.py
@@ -26,7 +26,6 @@ from .qtgui import (
 
 from mercurial import (
     error,
-    util,
 )
 
 from ..util import hglib
@@ -162,7 +161,7 @@ class BisectDialog(QDialog):
             return ctx.rev()
         except (error.LookupError, error.RepoLookupError), e:
             self._stbar.showMessage(hglib.tounicode(str(e)))
-        except util.Abort, e:
+        except error.Abort, e:
             if e.hint:
                 err = _('%s (hint: %s)') % (hglib.tounicode(str(e)),
                                             hglib.tounicode(e.hint))