changeset 22389 | 94f77624dbb5 |
parent 15623 | fc8c7a5ccc4a |
child 26716 | c027641f8a83 |
--- 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: