Mercurial > hg > pyhgsh
view tests/test-conflict @ 2322:685597676a13
packagescan: handle demandload module naming changes.
author | Volker Kleinfeld <Volker.Kleinfeld@gmx.de> |
---|---|
date | Fri, 19 May 2006 08:51:58 -0700 |
parents | e506c14382fd |
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" HGMERGE=merge; export HGMERGE hg merge 1 hg id egrep -v ">>>|<<<" a hg status