Commit edf50b32 authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

evolvecmd: rename `r` to usual `stats`

parent 95949b06bd48
......@@ -929,8 +929,8 @@ def _relocate(repo, orig, dest, evolvestate, pctx=None, keepbranch=False,
tr = repo.currenttransaction()
assert tr is not None
r = _evolvemerge(repo, orig, dest, pctx, keepbranch)
if r.unresolvedcount: # some conflict
stats = _evolvemerge(repo, orig, dest, pctx, keepbranch)
if stats.unresolvedcount: # some conflict
hint = _(b"see 'hg help evolve.interrupted'")
raise error.InterventionRequired(_(b"unresolved merge conflicts"),
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment