diff mercurial/merge.py @ 10868:1b82ab3c7194

merge with stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 06 Apr 2010 15:40:46 +0200
parents 0e64d814d7d0
children 7a0d096e221e
line wrap: on
line diff