diff tests/test-merge3.out @ 3293:4546a5e31cb8

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