##// END OF EJS Templates
tests: unify test-dispatch
tests: unify test-dispatch

File last commit:

r12156:4c94b6d0 default
r12157:88250a46 default
Show More
test-empty-file.out
20 lines | 640 B | text/plain | TextLexer
/ tests / test-empty-file.out
Alexis S. L. Carvalho
Test that we notice the empty files from the second parent during a merge...
r3509 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
r6336 created new head
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 2:a1cb177e0d44
Alexis S. L. Carvalho
Test that we notice the empty files from the second parent during a merge...
r3509 tag: tip
Martin Geisler
tests: remove unneeded -d flags...
r12156 parent: 0:1e1d9c4e5b64
Alexis S. L. Carvalho
Test that we notice the empty files from the second parent during a merge...
r3509 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Alexis S. L. Carvalho
Test that we notice the empty files from the second parent during a merge...
r3509 summary: add empty3
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 1:097d2b0e17f6
Alexis S. L. Carvalho
Test that we notice the empty files from the second parent during a merge...
r3509 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Alexis S. L. Carvalho
Test that we notice the empty files from the second parent during a merge...
r3509 summary: add empty2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M empty2
Patrick Mezard
Display symlink or executable bit with manifest -v...
r5405 b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty1
b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty2
b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty3