diff mercurial/ancestor.py @ 6656:2cbe0f72c379

Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Sat, 07 Jun 2008 11:43:16 +0200
parents 532ca442b903
children 8d78fc991b71
line wrap: on
line diff