upstream/mercurial-mirror Files · rust/hg-cpython/src

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

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

Martin von Zweigbergk -


            r49823:a54a8663

stable

Name	Size	Modified	Last Commit	Author
/ rust / hg-cpython / src
dirstate
ancestors.rs	Loading ...
cindex.rs	Loading ...
conversion.rs	Loading ...
copy_tracing.rs	Loading ...
dagops.rs	Loading ...
debug.rs	Loading ...
dirstate.rs	Loading ...
discovery.rs	Loading ...
exceptions.rs	Loading ...
lib.rs	Loading ...
pybytes_deref.rs	Loading ...
ref_sharing.rs	Loading ...
revlog.rs	Loading ...
utils.rs	Loading ...

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages