Skip to content
Snippets Groups Projects
Martin von Zweigbergk's avatar
Martin von Zweigbergk authored
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
6b1049d7
History
Name Last commit Last update