diff mercurial/simplemerge.py @ 25311:d2e88f960d1a

parsers: move index_get_parents's declaration higher index_get_parents needs to be used in the phase computation code so we need to move its declaration higher to be able to call it. It cannot be moved any higher than that so we won't have any more patch doing the same thing.
author Laurent Charignon <lcharignon@fb.com>
date Wed, 27 May 2015 17:00:28 -0700
parents 83df50a8d61c
children 241a1324a180
line wrap: on
line diff