--- a/tests/test-rebase-check-restore.t Sun Oct 11 15:04:00 2015 -0700
+++ b/tests/test-rebase-check-restore.t Fri Oct 09 13:54:52 2015 -0700
@@ -68,8 +68,7 @@
rebasing 1:27547f69f254 "B"
rebasing 2:965c486023db "C"
merging A
- warning: conflicts during merge.
- merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
@@ -125,8 +124,7 @@
$ hg rebase -s 5 -d 4 --keepbranches
rebasing 5:01e6ebbd8272 "F" (tip)
merging A
- warning: conflicts during merge.
- merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]