##// END OF EJS Templates
test: use the "correct" merge tool in `test-rebase-detach.t`...
Boris Feld -
r40502:b57f2734 default
parent child Browse files
Show More
@@ -293,7 +293,7 b' Ensure --continue restores a correct sta'
293 $ hg ci -A -m 'B2'
293 $ hg ci -A -m 'B2'
294 adding B
294 adding B
295 $ hg phase --force --secret .
295 $ hg phase --force --secret .
296 $ hg rebase -s . -d B --config ui.merge=internal:fail
296 $ hg rebase -s . -d B --config ui.merge=internal:merge
297 rebasing 3:17b4880d2402 "B2" (tip)
297 rebasing 3:17b4880d2402 "B2" (tip)
298 merging B
298 merging B
299 warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
299 warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
General Comments 0
You need to be logged in to leave comments. Login now