view tests/test-parseindex.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 6563438219e3
children
line wrap: on
line source

changeset:   0:9c2cf2b35aa7
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     add foo

changeset:   1:3756a9556b89
tag:         tip
user:        test
date:        Mon Jan 12 13:46:41 1970 +0000
summary:     change foo

2 revisions:
9c2cf2b35aa7
3756a9556b89