comparison mercurial/ancestor.py @ 5969:821fc5c0656c

Merge with -stable
author Matt Mackall <mpm@selenic.com>
date Thu, 31 Jan 2008 14:44:00 -0600
parents eb0b4a2d70a9
children 20aa460a52b6
comparison
equal deleted inserted replaced
5968:6dcc190ffc36 5969:821fc5c0656c