Submitter | Boris Feld |
---|---|
Date | Nov. 2, 2018, 9:31 a.m. |
Message ID | <9de8e01ffb96120d41a4.1541151113@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/36326/ |
State | Accepted |
Headers | show |
Comments
Patch
diff --git a/tests/test-rebase-detach.t b/tests/test-rebase-detach.t --- a/tests/test-rebase-detach.t +++ b/tests/test-rebase-detach.t @@ -293,7 +293,7 @@ Ensure --continue restores a correct sta $ 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')