tests/test-empty-file.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Wed, 25 Oct 2006 02:51:27 -0300
changeset 3509 9de0e64545a3
child 5405 8feb33c2d153
permissions -rw-r--r--
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.

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
changeset:   2:62ec0e86d1e5
tag:         tip
parent:      0:567dde5e6e98
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     add empty3

changeset:   1:41ab7b321727
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     add empty2

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M empty2
b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty1
b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty2
b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty3