tests/test-merge1.t
changeset 25111 1ef96a3b8b89
parent 19802 94c394653b2a
child 25382 6084926366b9
--- a/tests/test-merge1.t	Fri May 15 12:19:51 2015 +0800
+++ b/tests/test-merge1.t	Thu May 14 17:38:38 2015 +0200
@@ -40,6 +40,7 @@
   branch: default
   commit: (interrupted update)
   update: 1 new changesets (update)
+  phases: 2 draft (draft)
   $ rmdir b
   $ hg up
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -49,6 +50,7 @@
   branch: default
   commit: (clean)
   update: (current)
+  phases: 2 draft (draft)
 
 Prepare a basic merge