Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 4364:97962a3e73cf
Work around problem where 'del os.environ["FOO"]' doesn't update environment.
test-hook failed since changeset 949516072388 because of this on Solaris 8.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 19 Apr 2007 13:04:26 +0200 |
parents | 46280c004f22 |
children | 93a4e72b4f83 |
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 egrep -v ">>>|<<<" a hg status