##// END OF EJS Templates
copies: fix misaligned lines
Gábor Stefanik -
r33882:edf503e5 default
parent child Browse files
Show More
@@ -381,7 +381,7 b' def mergecopies(repo, c1, c2, base):'
381 # if we have a dirty endpoint, we need to trigger graft logic, and also
381 # if we have a dirty endpoint, we need to trigger graft logic, and also
382 # keep track of which endpoint is dirty
382 # keep track of which endpoint is dirty
383 dirtyc1 = not (base == _c1 or base.descendant(_c1))
383 dirtyc1 = not (base == _c1 or base.descendant(_c1))
384 dirtyc2 = not (base== _c2 or base.descendant(_c2))
384 dirtyc2 = not (base == _c2 or base.descendant(_c2))
385 graft = dirtyc1 or dirtyc2
385 graft = dirtyc1 or dirtyc2
386 tca = base
386 tca = base
387 if graft:
387 if graft:
General Comments 0
You need to be logged in to leave comments. Login now