view tests/test-cat.out @ 3400:d2b55e3c4e25

merge: if filemerge skips merge, report as updated
author Matt Mackall <mpm@selenic.com>
date Sun, 15 Oct 2006 16:18:09 -0500
parents 7544700fd931
children f5b00b6e426a
line wrap: on
line source

adding a
adding b
0
0
0
a: No such file in rev 03f6b0774996
1