diff tests/test-double-merge @ 5587:121f9dbcc236

update test output
author Matt Mackall <mpm@selenic.com>
date Sun, 02 Dec 2007 16:26:56 -0600
parents 99a4592ea886
children 50b6af595e0c
line wrap: on
line diff