Mercurial > hg
diff mercurial/discovery.py @ 22056:83df50a8d61c
simplemerge: remove dead code
The following functions in simplemerge are dead code. I reran "make
test-merge*" after this change, and it passed. Looks like cruft that
we've been carrying since we nabbed this code from bzr.
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Thu, 07 Aug 2014 12:51:45 -0400 |
parents | 32601b0b74c0 |
children | 70383c6961b4 |