sapling/tests/test-empty-file.out
Alexis S. L. Carvalho 846337c179 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 41b753e617ee.
2006-10-25 02:51:27 -03:00

20 lines
617 B
Plaintext

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