Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 5289:ed6df6b1c29a
Prevent WSGI apps from touching sys.stdin by setting ui.interactive to False.
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Fri, 07 Sep 2007 17:38:52 +0200 |
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