163
164
BzrError.__init__(self, location=location)
173
167
class SharedUpstreamConflictsWithTargetPackaging(BzrError):
174
168
_fmt = ('The upstream branches for the merge source and target have '
175
169
'diverged. Unfortunately, the attempt to fix this problem '