##// END OF EJS Templates
test-merge5: removed unnecessary parts of test...
test-merge5: removed unnecessary parts of test - no need to initialize a new directory - no need to fix the commit time, already done by run-tests - no need to exit 0, use exit code from hg instead - better spacing around comments

File last commit:

r6336:4b0c9c67 default
r12155:94ad12aa default
Show More
test-empty-file.out
20 lines | 640 B | text/plain | TextLexer
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
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