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