Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-bookmarks-rebase.t
changeset 45826 21733e8c924f
parent 45796 e9555305c5c6
child 49621 55c6ebd11cb9 
--- a/tests/test-bookmarks-rebase.t	Sat Nov 07 21:50:28 2020 -0800
+++ b/tests/test-bookmarks-rebase.t	Wed Oct 21 19:00:16 2020 -0700
@@ -81,7 +81,7 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
-  [1]
+  [240]
   $ hg rebase --abort
   rebase aborted
   $ hg bookmark
@@ -96,7 +96,7 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
-  [1]
+  [240]
   $ hg bookmark -d three
   $ hg rebase --abort
   rebase aborted
Mercurial