##// END OF EJS Templates
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-core / src
dirstate
operations
revlog
utils
ancestors.rs Loading ...
copy_tracing.rs Loading ...
dagops.rs Loading ...
dirstate.rs Loading ...
discovery.rs Loading ...
filepatterns.rs Loading ...
lib.rs Loading ...
matchers.rs Loading ...
requirements.rs Loading ...
revlog.rs Loading ...
testing.rs Loading ...
utils.rs Loading ...