Searched refs:MergeError (Results 1 – 1 of 1) sorted by relevance
132 class MergeError(Exception): class134 super(MergeError, self).__init__(msg)149 raise MergeError('{name}: {e}'.format(**locals()))182 …raise MergeError('{base} (from {base_origin}) != {other} (from {other_origin})'.format(**locals()))