comparison tests/test-merge1.out @ 7888:206334f8aa0b

Merge with -stable
author Matt Mackall <mpm@selenic.com>
date Tue, 24 Mar 2009 16:41:41 -0500
parents 4b0c9c674707
children 50b6af595e0c
comparison
equal deleted inserted replaced
7886:c2ecaf63bade 7888:206334f8aa0b