comparison mercurial/simplemerge.py @ 9135:df881932362f

merge with -stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 14 Jul 2009 20:24:16 +0200
parents b87a50b7125c
children 08a0f04b56bd
comparison
equal deleted inserted replaced
9134:a5c060b80082 9135:df881932362f