tests/test-rebase-bookmarks.t
changeset 19925 9c78ed396075
parent 19641 5528c31c629c
child 19926 0f99747202f9
--- a/tests/test-rebase-bookmarks.t	Mon Oct 14 16:49:54 2013 +0200
+++ b/tests/test-rebase-bookmarks.t	Mon Oct 14 16:12:29 2013 +0200
@@ -119,9 +119,9 @@
   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog
-  @  3: 'C' bookmarks: Y Z
+  o  3: 'C' bookmarks: Y Z
   |
-  o  2: 'B' bookmarks: X
+  @  2: 'B' bookmarks: X
   |
   o  1: 'D' bookmarks: W
   |
@@ -130,7 +130,7 @@
 rebase --continue with bookmarks present (issue3802)
 
   $ hg up 2
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 'C' > c
   $ hg add c
   $ hg ci -m 'other C'