# HG changeset patch # User Gábor Stefanik # Date 2017-08-22 14:16:39 # Node ID edf503e5dfd408f900f3bad0a6923573813e276b # Parent 169baf3d1d3c66e97463eb2213b614ac0316306e copies: fix misaligned lines diff --git a/mercurial/copies.py b/mercurial/copies.py --- a/mercurial/copies.py +++ b/mercurial/copies.py @@ -381,7 +381,7 @@ def mergecopies(repo, c1, c2, base): # if we have a dirty endpoint, we need to trigger graft logic, and also # keep track of which endpoint is dirty dirtyc1 = not (base == _c1 or base.descendant(_c1)) - dirtyc2 = not (base== _c2 or base.descendant(_c2)) + dirtyc2 = not (base == _c2 or base.descendant(_c2)) graft = dirtyc1 or dirtyc2 tca = base if graft: