##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

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
Dirkjan Ochtman - - Load All Authors

File last commit:

r6336:4b0c9c67 default
r12155:94ad12aa default
Show More
test-empty-file.out
20 lines | 640 B | text/plain | TextLexer
/ tests / test-empty-file.out
History | Source | Raw |Copy content |Copy permalink
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
Alexis S. L. Carvalho
Test that we notice the empty files from the second parent during a merge...
 r3509 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
Patrick Mezard
Display symlink or executable bit with manifest -v...
 r5405 b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty1
b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty2
b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty3