Mercurial > hg
comparison mercurial/scmposix.py @ 46139:3ca5ca380a34
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
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 14 Dec 2020 18:09:37 -0800 |
| parents | 9ac96b9fa76e |
| children | 6000f5b25c9b |
comparison
equal
deleted
inserted
replaced
| 46138:34f2c634c8f6 | 46139:3ca5ca380a34 |
|---|