changeset 25382 | 6084926366b9 |
parent 25111 | 1ef96a3b8b89 |
child 25753 | fe03f522dda9 |
--- a/tests/test-merge1.t Mon May 25 16:48:55 2015 -0700 +++ b/tests/test-merge1.t Fri May 29 22:23:58 2015 +0200 @@ -40,7 +40,7 @@ branch: default commit: (interrupted update) update: 1 new changesets (update) - phases: 2 draft (draft) + phases: 2 draft $ rmdir b $ hg up 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -50,7 +50,7 @@ branch: default commit: (clean) update: (current) - phases: 2 draft (draft) + phases: 2 draft Prepare a basic merge