Mercurial > hg
comparison tests/test-rebase-detach.t @ 40466:b57f2734ac92
test: use the "correct" merge tool in `test-rebase-detach.t`
The value of `HGMERGE` overrides the value passed through --config. We are
about to drop this `HGMERGE` environment variable so we update the value used
in config to match what is currently in use.
This is another example of confusion introduced by the `HGMERGE` environment
variable.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Thu, 01 Nov 2018 14:24:34 +0100 |
parents | 4441705b7111 |
children | 09680349cc2d |
comparison
equal
deleted
inserted
replaced
40465:1736450cd1df | 40466:b57f2734ac92 |
---|---|
291 $ hg up -q C | 291 $ hg up -q C |
292 $ echo 'B2' > B | 292 $ echo 'B2' > B |
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') |
300 unresolved conflicts (see hg resolve, then hg rebase --continue) | 300 unresolved conflicts (see hg resolve, then hg rebase --continue) |
301 [1] | 301 [1] |