equal
deleted
inserted
replaced
82 |
82 |
83 class NoMergeDestAbort(MergeDestAbort): |
83 class NoMergeDestAbort(MergeDestAbort): |
84 """Raised when an update is aborted because there is nothing to merge""" |
84 """Raised when an update is aborted because there is nothing to merge""" |
85 |
85 |
86 class ManyMergeDestAbort(MergeDestAbort): |
86 class ManyMergeDestAbort(MergeDestAbort): |
87 """Raised when an update is aborted because destination is ambigious""" |
87 """Raised when an update is aborted because destination is ambiguous""" |
88 |
88 |
89 class ResponseExpected(Abort): |
89 class ResponseExpected(Abort): |
90 """Raised when an EOF is received for a prompt""" |
90 """Raised when an EOF is received for a prompt""" |
91 def __init__(self): |
91 def __init__(self): |
92 from .i18n import _ |
92 from .i18n import _ |