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

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