mergedriver: delete it
The merge driver code was added in late 2015. I think '406a654b41cb::6f045b563fa5 & 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
Showing
- mercurial/commands.py 2 additions, 59 deletionsmercurial/commands.py
- mercurial/configitems.py 0 additions, 3 deletionsmercurial/configitems.py
- mercurial/helptext/internals/mergestate.txt 0 additions, 12 deletionsmercurial/helptext/internals/mergestate.txt
- mercurial/merge.py 0 additions, 71 deletionsmercurial/merge.py
- mercurial/mergestate.py 14 additions, 119 deletionsmercurial/mergestate.py
- mercurial/mergeutil.py 0 additions, 5 deletionsmercurial/mergeutil.py
- tests/test-resolve.t 0 additions, 58 deletionstests/test-resolve.t
Loading
-
mentioned in commit ecb8295f5e41
-
mentioned in commit 38941a28406a
Please register or sign in to comment