Mercurial > hg
view tests/test-conflict @ 6499:479847ccabe0
Added hgexecutable support for py2exe/frozen scripts
author | "Paul Moore <p.f.moore@gmail.com>" |
---|---|
date | Thu, 20 Dec 2007 20:02:51 +0000 |
parents | 93a4e72b4f83 |
children |
line wrap: on
line source
#!/bin/sh hg init echo "nothing" > a hg add a hg commit -m ancestor -d "1000000 0" echo "something" > a hg commit -m branch1 -d "1000000 0" hg co 0 echo "something else" > a hg commit -m branch2 -d "1000000 0" hg merge 1 hg id cat a hg status