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

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

make manifest friendlier...
make manifest friendlier switch to using context code ..which uses first parent by default show file hashes only with debug switch show permissions with verbose fix up tests
Vadim Gelfer - - Load All Authors

File last commit:

r2283:e506c143 default
r3736:ad3d5b43 default
Show More
test-merge4
17 lines | 335 B | text/plain | TextLexer
/ tests / test-merge4
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "1000000 0"
hg update 0
echo This is file c1 > c
hg add c
hg commit -m "commit #2" -d "1000000 0"
hg merge 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "1000000 0"