Mercurial > hg
view tests/test-merge4 @ 5018:c7623d2b2a66
convert: get rid of ugly use of hasattr
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Thu, 26 Jul 2007 13:36:53 -0700 |
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"