diff mercurial/ancestor.py @ 6549:2af1b9de62b3

Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Mon, 14 Apr 2008 23:04:34 +0200
parents 532ca442b903
children 8d78fc991b71
line wrap: on
line diff