Mercurial > hg

diff mercurial/tagmerge.py @ 22056:83df50a8d61c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 50e20154cb68
children b27c3beaaf30
line wrap: on
line diff