tests/test-empty-file.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Fri, 26 Oct 2007 12:37:59 +0200
changeset 5493 04f033a03b1d
parent 5405 8feb33c2d153
child 6336 4b0c9c674707
permissions -rw-r--r--
merge with -stable

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