simplemerge: don't calculate conflict labels when resolving automatically
Differential Revision: https://phab.mercurial-scm.org/D11903
Loading
Please register or sign in to comment
Differential Revision: https://phab.mercurial-scm.org/D11903