marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12105 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -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): To: marmoute, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
