mercurial/error.py
changeset 28141 13bb8de97f87
parent 27628 707d66afce21
child 29509 945b4c14c570
--- a/mercurial/error.py	Mon Feb 08 22:58:15 2016 +0000
+++ b/mercurial/error.py	Tue Feb 09 23:30:41 2016 +0000
@@ -72,6 +72,15 @@
 class UpdateAbort(Abort):
     """Raised when an update is aborted for destination issue"""
 
+class MergeDestAbort(Abort):
+    """Raised when an update is aborted for destination issues"""
+
+class NoMergeDestAbort(MergeDestAbort):
+    """Raised when an update is aborted because there is nothing to merge"""
+
+class ManyMergeDestAbort(MergeDestAbort):
+    """Raised when an update is aborted because destination is ambigious"""
+
 class ResponseExpected(Abort):
     """Raised when an EOF is received for a prompt"""
     def __init__(self):