changeset 48702 | ec23b0ba85c2 |
parent 48701 | 85c69b0dfa8f |
child 48703 | 6c4b10d01af0 |
--- a/mercurial/merge.py Fri Jan 28 14:24:30 2022 +0100 +++ b/mercurial/merge.py Fri Jan 28 14:24:41 2022 +0100 @@ -537,9 +537,8 @@ hint = _(b'merging in the other direction may work') raise error.Abort(msg % f, hint=hint) else: - raise error.StateError( - _(b'conflict in file \'%s\' is outside narrow clone') % f - ) + msg = _(b'conflict in file \'%s\' is outside narrow clone') + raise error.StateError(msg % f) class mergeresult(object):