comparison tests/test-merge-default.out @ 3281:f49c90b46897

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