Mercurial > hg
view tests/test-revlog-ancestry.py.out @ 42804:7b80ad5af239
merge: hint about using `hg resolve` for resolving conflicts
This was suggested by one of our users at Google. Makes sense to me.
Differential Revision: https://phab.mercurial-scm.org/D6755
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 21 Aug 2019 13:14:39 -0700 |
parents | a60dae060bc8 |
children |
line wrap: on
line source
Ancestors of 5 4 2 0 Ancestors of 6 and 5 4 3 2 1 0 Ancestors of 5 and 4 4 2 0 Ancestors of 7, stop at 6 6 Ancestors of 7, including revs 7 6 5 4 3 2 1 0 Ancestors of 7, 5 and 3, including revs 7 6 5 4 3 2 1 0 Descendants of 5 7 8 Descendants of 5 and 3 6 7 8 Descendants of 5 and 4 5 7 8