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

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