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

simplemerge: add a specialized function for "union", "local", "other"

Differential Revision: https://phab.mercurial-scm.org/D11901
parent 47f2a82a
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