##// END OF EJS Templates
simplemerge: don't calculate conflict labels when resolving automatically...
simplemerge: don't calculate conflict labels when resolving automatically Differential Revision: https://phab.mercurial-scm.org/D11903
Martin von Zweigbergk -
r49347:59524cb1 default
Show More
Name Size Modified Last Commit Author
/ mercurial / upgrade_utils
__init__.py Loading ...
actions.py Loading ...
engine.py Loading ...