equal
deleted
inserted
replaced
535 b'which is not yet supported' |
535 b'which is not yet supported' |
536 ) |
536 ) |
537 hint = _(b'merging in the other direction may work') |
537 hint = _(b'merging in the other direction may work') |
538 raise error.Abort(msg % f, hint=hint) |
538 raise error.Abort(msg % f, hint=hint) |
539 else: |
539 else: |
540 raise error.StateError( |
540 msg = _(b'conflict in file \'%s\' is outside narrow clone') |
541 _(b'conflict in file \'%s\' is outside narrow clone') % f |
541 raise error.StateError(msg % f) |
542 ) |
|
543 |
542 |
544 |
543 |
545 class mergeresult(object): |
544 class mergeresult(object): |
546 """An object representing result of merging manifests. |
545 """An object representing result of merging manifests. |
547 |
546 |