diff tests/test-merge1.out @ 3316:0e370798eebf

context: add cmp for filectxs
author Matt Mackall <mpm@selenic.com>
date Tue, 10 Oct 2006 01:13:03 -0500
parents a31557193f3c
children 966632304dde 49966b5ab16f
line wrap: on
line diff