Mercurial > evolve
diff tests/test-evolve-content-divergent-case-A4.t @ 5754:03410b04cf10 mercurial-5.6
tests: back out changeset 59b2be90e9fd
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Thu, 28 Jan 2021 18:57:48 +0800 |
parents | c2fab88e6d60 |
children |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-case-A4.t Thu Jan 28 18:48:41 2021 +0800 +++ b/tests/test-evolve-content-divergent-case-A4.t Thu Jan 28 18:57:48 2021 +0800 @@ -84,12 +84,12 @@ $ cd ../local $ hg pull -qu $ hg rebase -r 'desc(D)' -d 'desc(C)' - rebasing 4:6a418860e87b tip "D" + rebasing 4:6a418860e87b "D" (tip) $ cd ../other $ hg pull -qu $ hg rebase -r 'desc(D)' -d 'desc(B)' - rebasing 4:6a418860e87b tip "D" + rebasing 4:6a418860e87b "D" (tip) $ hg push -q $ cd ../local