tests/test-rebase-conflicts.t
changeset 34661 eb586ed5d8ce
parent 33844 437e317d7913
child 34865 a0100f34e20b
--- a/tests/test-rebase-conflicts.t	Fri Oct 13 21:36:10 2017 +0900
+++ b/tests/test-rebase-conflicts.t	Thu Oct 12 09:39:50 2017 +0200
@@ -156,6 +156,7 @@
   adding manifests
   adding file changes
   added 11 changesets with 8 changes to 3 files (+1 heads)
+  new changesets 24797d4f68de:2f2496ddf49d
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd issue4041