comparison tests/test-merge1 @ 5587:121f9dbcc236

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