Mercurial > public > mercurial-scm > hg-stable
diff tests/test-merge-default.t @ 22389:94f77624dbb5
comments: describe ancestor consistently - avoid 'least common ancestor'
"best" is as defined by mercurial.ancestor.ancestors: furthest from a root (as
measured by longest path).
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Tue, 19 Aug 2014 01:13:10 +0200 |
| parents | fc8c7a5ccc4a |
| children | c027641f8a83 |
line wrap: on
line diff
--- a/tests/test-merge-default.t Tue Aug 19 01:12:56 2014 +0200 +++ b/tests/test-merge-default.t Tue Aug 19 01:13:10 2014 +0200 @@ -97,8 +97,7 @@ Test for issue2043: ensure that 'merge -P' shows ancestors of 6 that -are not ancestors of 7, regardless of where their least common -ancestor is. +are not ancestors of 7, regardless of where their common ancestors are. Merge preview not affected by common ancestor: