Show More
@@ -542,7 +542,7 b' def _filternarrowactions(narrowmatch, br' | |||
|
542 | 542 | hint=_(b'merging in the other direction may work'), |
|
543 | 543 | ) |
|
544 | 544 | else: |
|
545 |
raise error. |
|
|
545 | raise error.StateError( | |
|
546 | 546 | _(b'conflict in file \'%s\' is outside narrow clone') % f |
|
547 | 547 | ) |
|
548 | 548 |
General Comments 0
You need to be logged in to leave comments.
Login now