diff tests/test-merge7.out @ 5587:121f9dbcc236

update test output
author Matt Mackall <mpm@selenic.com>
date Sun, 02 Dec 2007 16:26:56 -0600
parents 17ed9b9a0d03
children 5af5f0f9d724
line wrap: on
line diff