Mercurial Mercurial > mercurial / 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-rebase-check-restore.t
changeset 45771 f90a5c211251
parent 45412 aaeccdb6e654
child 45794 330c258fe7ca 
--- a/tests/test-rebase-check-restore.t	Thu Oct 22 23:10:06 2020 -0700
+++ b/tests/test-rebase-check-restore.t	Tue Oct 27 15:33:15 2020 -0700
@@ -123,7 +123,7 @@
   o  0:draft 'A'
   
   $ hg rebase -s 5 -d 4 --keepbranches
-  rebasing 5:01e6ebbd8272 "F" (tip)
+  rebasing 5:01e6ebbd8272 tip "F"
   merging A
   warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -137,7 +137,7 @@
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase --continue
-  rebasing 5:01e6ebbd8272 "F" (tip)
+  rebasing 5:01e6ebbd8272 tip "F"
   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-6fd3a015-rebase.hg
 
   $ hg tglog
mercurial