comparison tests/test-merge2.out @ 3281:f49c90b46897

Update test output
author Matt Mackall <mpm@selenic.com>
date Fri, 06 Oct 2006 17:14:50 -0500
parents b2ae81a7df29
children 4b0c9c674707
comparison
equal deleted inserted replaced
3280:45b639607e52 3281:f49c90b46897