Simon Sapin <simon.sapin@octobus.net> [Thu, 17 Dec 2020 12:28:39 +0100] rev 46140
rust: document how to enable debug information in optimized builds
This is particularly useful when profiling.
Differential Revision: https://phab.mercurial-scm.org/D9625
Martin von Zweigbergk <martinvonz@google.com> [Mon, 14 Dec 2020 18:09:37 -0800] rev 46139
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