view tests/test-cat.out @ 3506:9de0e64545a3

Test that we notice the empty files from the second parent during a merge This didn't work with 0.9.1, but was fixed by 05257fd28591.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Wed, 25 Oct 2006 02:51:27 -0300
parents 7544700fd931
children
line wrap: on
line source

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