comparison tests/test-merge2.out @ 5587:121f9dbcc236

update test output
author Matt Mackall <mpm@selenic.com>
date Sun, 02 Dec 2007 16:26:56 -0600
parents b2ae81a7df29
children 4b0c9c674707
comparison
equal deleted inserted replaced
5576:1c1ef561d541 5587:121f9dbcc236