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

filemerge: make `_filemerge()` do both premerge and merge

This patch removes the `premerge` argument from `_filemerge()` and
makes it do both the "premerge" and "merge" steps without the caller
having to call it twice.

Differential Revision: https://phab.mercurial-scm.org/D11859
parent 921853391276
No related branches found
No related tags found
Loading
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