Mercurial > hg
view tests/test-revlog-ancestry.py.out @ 40465:1736450cd1df
test: also deactivate `ui.merge` when testing merge tool
We are about to introduce a default config for `ui.merge`. Since
`test-merge-tools.t` is about testing merge configuration, we need to make sure
it won't interfere.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Wed, 31 Oct 2018 19:12:32 +0100 |
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