Mercurial Mercurial > hg / changelog
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | zip | gz | bz2 | help
(0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mon, 14 Dec 2020 18:09:37 -0800 filemerge: add support for the new "mergediff" marker style to premerge
changeset
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
(0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 tip
Mercurial