diff tests/test-merge7.out @ 5207:1108c952cca1

Merge with -stable
author Matt Mackall <mpm@selenic.com>
date Sun, 19 Aug 2007 14:04:26 -0500
parents 93a4e72b4f83
children 17ed9b9a0d03
line wrap: on
line diff