Mercurial > hg

diff tests/test-rebase-check-restore.out @ 11198:b345b1cc124f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: use helpers.sh in tests
author Matt Mackall <mpm@selenic.com>
date Wed, 19 May 2010 20:20:12 -0500
parents 4bb4895e1693
children 34023f2ca305
line wrap: on
line diff
--- a/tests/test-rebase-check-restore.out	Wed May 19 19:46:39 2010 -0500
+++ b/tests/test-rebase-check-restore.out	Wed May 19 20:20:12 2010 -0500
@@ -12,10 +12,10 @@
 |/
 o  0:A:
 
-merging A
 warning: conflicts during merge.
 merging A failed!
 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+merging A
 
 % - Solve the conflict and go on
 rebase completed
@@ -49,10 +49,10 @@
 |/
 o  0:A:
 
-merging A
 warning: conflicts during merge.
 merging A failed!
 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+merging A
 
 % - Solve the conflict and go on
 adding branch