diff tests/test-merge2 @ 5587:121f9dbcc236

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