##// END OF EJS Templates
test-merge-force: add tests for merge.checkunknown=warn...
test-merge-force: add tests for merge.checkunknown=warn In an upcoming patch we're going to change the behavior of some merges with merge.checkunknown=warn or ignore -- ensure that the behavior of the deprecated 'merge --force' remains the same.
Siddharth Agarwal -
r28021:d0d805df default
Show More
Name Size Modified Last Commit Author
/ mercurial / pure
__init__.py Loading ...
base85.py Loading ...
bdiff.py Loading ...
diffhelpers.py Loading ...
mpatch.py Loading ...
osutil.py Loading ...
parsers.py Loading ...