##// 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.
Boris Feld -
r40502:b57f2734 default
Show More
Name Size Modified Last Commit Author
/ mercurial / cffi
__init__.py Loading ...
bdiff.py Loading ...
bdiffbuild.py Loading ...
mpatch.py Loading ...
mpatchbuild.py Loading ...
osutil.py Loading ...
osutilbuild.py Loading ...