Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 1925:c71420b186b0
small solaris portability fixes from John Levon <levon@movementarian.org>
author | Peter van Dijk <peter@dataloss.nl> |
---|---|
date | Wed, 22 Feb 2006 15:42:48 +0100 |
parents | 0902ffece4b4 |
children | 7544700fd931 |
line wrap: on
line source
#!/bin/sh hg init echo "nothing" > a hg add a hg commit -m ancestor -d "0 0" echo "something" > a hg commit -m branch1 -d "0 0" hg co 0 echo "something else" > a hg commit -m branch2 -d "0 0" HGMERGE=merge; export HGMERGE hg up -m 1 hg id egrep -v ">>>|<<<" a hg status