Mercurial > hg > pyhgsh
view tests/test-merge4 @ 1932:82995896d5af
Merge with http://hg.home.dataloss.nl/hg-portabletests
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 13 Mar 2006 12:22:55 +0100 |
parents | 0902ffece4b4 |
children | 7544700fd931 |
line wrap: on
line source
#!/bin/sh hg init echo This is file a1 > a hg add a hg commit -m "commit #0" -d "0 0" echo This is file b1 > b hg add b hg commit -m "commit #1" -d "0 0" hg update 0 echo This is file c1 > c hg add c hg commit -m "commit #2" -d "0 0" hg update -m 1 rm b echo This is file c22 > c hg commit -m "commit #3" -d "0 0"