diff tests/test-simple-update.out @ 3296:4546a5e31cb8

Use filelog.cmp in checkfilemerge
author Matt Mackall <mpm@selenic.com>
date Sun, 08 Oct 2006 20:18:59 -0500
parents 9d1c3529ebbc
children 8feb33c2d153
line wrap: on
line diff