Mercurial > public > mercurial-scm > hg
diff mercurial/configitems.py @ 45518:32ce4cbaec4b
mergedriver: delete it
The merge driver code was added in late 2015. I think
'406a654b::6f045b56 & user("sid0")' is a reasonable revset for finding
the relevant commits, including preparation for it. The code is very
poorly tested, which makes it very hard to maintain. It seems it's
only used by FB and they don't use this code base anymore, so let's
remove the code to make it easier for us to maintain our product.
Differential Revision: https://phab.mercurial-scm.org/D9041
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 17 Sep 2020 22:34:36 -0700 |
| parents | d252f51ab032 |
| children | b9d6ab6cdeb4 |
line wrap: on
line diff
--- a/mercurial/configitems.py Sun Sep 06 10:33:12 2020 +0200 +++ b/mercurial/configitems.py Thu Sep 17 22:34:36 2020 -0700 @@ -635,9 +635,6 @@ coreconfigitem( b'experimental', b'httppostargs', default=False, ) -coreconfigitem( - b'experimental', b'mergedriver', default=None, -) coreconfigitem(b'experimental', b'nointerrupt', default=False) coreconfigitem(b'experimental', b'nointerrupt-interactiveonly', default=True)