Show More
@@ -537,9 +537,8 b' def _filternarrowactions(narrowmatch, br' | |||||
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): |
General Comments 0
You need to be logged in to leave comments.
Login now