--- a/tests/test-rebase-abort.t Wed Sep 20 07:46:55 2017 +0530
+++ b/tests/test-rebase-abort.t Tue Sep 19 22:06:26 2017 -0700
@@ -266,7 +266,7 @@
$ hg rebase -d master -r foo
- rebasing 3:6c0f977a22d8 "C" (tip foo)
+ rebasing 3:6c0f977a22d8 "C" (foo tip)
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
@@ -306,7 +306,7 @@
created new head
$ hg rebase -d @ -b foo --tool=internal:fail
- rebasing 2:070cf4580bb5 "b2" (tip foo)
+ rebasing 2:070cf4580bb5 "b2" (foo tip)
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]