comparison mercurial/peer.py @ 30186:f7ed5af31242

mergecopies: rename 'ca' to 'base' This variable was named after the common ancestor. It is actually the merge base that might differ from the common ancestor in the graft case. We rename the variable before a larger refactoring to clarify the situation. Similar rename was also applied to 'checkcopies' in a prior changeset.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Thu, 13 Oct 2016 01:30:14 +0200
parents ead25aa27a43
children e2fc2122029c
comparison
equal deleted inserted replaced
30185:e2bfe2d52d7a 30186:f7ed5af31242