##// END OF EJS Templates
test: use the "correct" merge tool in `test-rebase-detach.t`...
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.

File last commit:

r29813:5f86818c default
r40502:b57f2734 default
Show More
map
2 lines | 45 B | text/plain | TextLexer
__base__ = ../paper/map
header = header.tmpl