Mercurial > hg > pyhgsh
view tests/test-merge4 @ 2338:391c5d0f9ef3
Minor typo change to reflect actual values used.
author | "Daniel Santa Cruz <dansan@vikus.com>" |
---|---|
date | Mon, 22 May 2006 12:17:44 -0400 |
parents | e506c14382fd |
children |
line wrap: on
line source
#!/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"