annotate mercurial/__init__.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 9117c6561b0b
children 4374d819ccd5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source