##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

filemerge: add support for the new "mergediff" marker style to premerge...
filemerge: add support for the new "mergediff" marker style to premerge This adds support for the new "mergediff" conflict marker style to "merge-tools.<tool>.premerge" (the new value is called "keep-mergediff"). Differential Revision: https://phab.mercurial-scm.org/D9606
Martin von Zweigbergk -
r46755:3ca5ca38 default
Show More
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 ...
parsers.rs Loading ...
ref_sharing.rs Loading ...
revlog.rs Loading ...
utils.rs Loading ...