Mercurial > hg
view tests/test-conflict @ 10586:efd3b71fc293
win32/hgwebdir_wsgi: clarify documentation and clean up script a bit
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Thu, 04 Mar 2010 13:10:48 +0100 |
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