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

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