Skip to content
Snippets Groups Projects
Commit 59524cb1cd73 authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

simplemerge: don't calculate conflict labels when resolving automatically

Differential Revision: https://phab.mercurial-scm.org/D11903
parent bd27dad294b7
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment