comparison tests/test-merge1.out @ 3296:4546a5e31cb8

Use filelog.cmp in checkfilemerge
author Matt Mackall <mpm@selenic.com>
date Sun, 08 Oct 2006 20:18:59 -0500
parents a31557193f3c
children 966632304dde 49966b5ab16f
comparison
equal deleted inserted replaced
3295:764688cf51e5 3296:4546a5e31cb8