Mercurial > hg

comparison tests/test-merge2.t @ 30135:3eae81c0a09d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
checkcopies: 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.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Sat, 08 Oct 2016 18:38:42 +0200
parents f2719b387380
children 1850066f9e36
comparison
equal deleted inserted replaced
30134:165c9526e594 30135:3eae81c0a09d