##// END OF EJS Templates
Moving hgweb.py into it's own module in preparation for breaking it up.
Moving hgweb.py into it's own module in preparation for breaking it up.

File last commit:

r2283:e506c143 default
r2311:b832b6eb default
Show More
test-merge4
17 lines | 335 B | text/plain | TextLexer
#!/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"