diff tests/test-incoming-outgoing.out @ 3296:4546a5e31cb8

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