changeset 40518 | b57f2734ac92 |
parent 35400 | 4441705b7111 |
child 40882 | 09680349cc2d |
--- a/tests/test-rebase-detach.t Wed Oct 31 19:12:32 2018 +0100 +++ b/tests/test-rebase-detach.t Thu Nov 01 14:24:34 2018 +0100 @@ -293,7 +293,7 @@ $ hg ci -A -m 'B2' adding B $ hg phase --force --secret . - $ hg rebase -s . -d B --config ui.merge=internal:fail + $ hg rebase -s . -d B --config ui.merge=internal:merge rebasing 3:17b4880d2402 "B2" (tip) merging B warning: conflicts while merging B! (edit, then use 'hg resolve --mark')