author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
Sat, 08 Oct 2016 19:03:16 +0200 | |
changeset 30136 | 8797eadb5d90 |
parent 30135 | 3eae81c0a09d |
child 30137 | f85f9e069e09 |
--- a/mercurial/copies.py Sat Oct 08 18:38:42 2016 +0200 +++ b/mercurial/copies.py Sat Oct 08 19:03:16 2016 +0200 @@ -459,7 +459,7 @@ check possible copies of f from m1 to m2 ctx = starting context for f in m1 - f = the filename to check + f = the filename to check (as in m1) m1 = the source manifest m2 = the destination manifest base = the changectx used as a merge base