##// 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 / revlog
changelog.rs Loading ...
index.rs Loading ...
manifest.rs Loading ...
node.rs Loading ...
nodemap.rs Loading ...
nodemap_docket.rs Loading ...
patch.rs Loading ...
path_encode.rs Loading ...
revlog.rs Loading ...