diff tests/test-up-local-change.out @ 3296:4546a5e31cb8

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