Mercurial > hg-stable
changeset 48716:ec23b0ba85c2
merge: break up a not-so-one-liner for readability
Differential Revision: https://phab.mercurial-scm.org/D12105
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 28 Jan 2022 14:24:41 +0100 |
| parents | 85c69b0dfa8f |
| children | 6c4b10d01af0 |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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):