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

filemerge: when merge tool uses $output, don't leave markers in $local

As explained in the previous patch, we incorrectly leave conflict
markers in both `$local` and `$output` since D12190. I don't
understand why it broke but the fix is simple and clear after all the
recent refactoring.

Differential Revision: https://phab.mercurial-scm.org/D12379
parent b10a944c
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