Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-issue5832.t
branchstable
changeset 5197 143ac9ac77a3
parent 4577 bcd52ce0916d
child 5314 f12d2172a133 
--- a/tests/test-evolve-issue5832.t	Fri Mar 06 18:39:40 2020 +0100
+++ b/tests/test-evolve-issue5832.t	Wed Mar 11 18:28:26 2020 +0100
@@ -117,7 +117,7 @@
   move:[2] added b
   atop:[5] added a
   move:[4] merge commit
-  ancestor '7235ef625ea3' split over multiple topological branches.
+  ancestor of '7235ef625ea3' split over multiple topological branches.
   choose an evolve destination:
   1: [62fb70414f99] added c
   2: [5841d7cf9893] added d
@@ -257,7 +257,7 @@
   move:[2] added b
   atop:[6] added a
   move:[4] merge commit
-  ancestor 'cdf2ea1b9312' split over multiple topological branches.
+  ancestor of 'cdf2ea1b9312' split over multiple topological branches.
   choose an evolve destination:
   1: [62fb70414f99] added c
   2: [5841d7cf9893] added d
@@ -402,7 +402,7 @@
   > EOF
   move:[2] added b
   atop:[6] added a
-  ancestor 'b9b387427a53' split over multiple topological branches.
+  ancestor of 'b9b387427a53' split over multiple topological branches.
   choose an evolve destination:
   1: [62fb70414f99] added c
   2: [5841d7cf9893] added d
evolve