--- a/tests/test-rebase-abort.t Sun Oct 11 15:04:00 2015 -0700
+++ b/tests/test-rebase-abort.t Fri Oct 09 13:54:52 2015 -0700
@@ -64,8 +64,7 @@
rebasing 3:3163e20567cc "L1"
rebasing 4:46f0b057b5c0 "L2" (tip)
merging common
- warning: conflicts during merge.
- merging common incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging common! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
@@ -94,8 +93,7 @@
rebasing 3:3163e20567cc "L1"
rebasing 4:46f0b057b5c0 "L2" (tip)
merging common
- warning: conflicts during merge.
- merging common incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging common! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
@@ -165,8 +163,7 @@
note: rebase of 3:a6484957d6b9 created no changes to commit
rebasing 4:145842775fec "C1" (tip)
merging c
- warning: conflicts during merge.
- merging c incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
@@ -225,8 +222,7 @@
$ hg rebase -d master -r foo
rebasing 3:6c0f977a22d8 "C" (tip foo)
merging c
- warning: conflicts during merge.
- merging c incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ hg rebase --abort