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

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