Mercurial > hg > pyhgsh
view tests/test-conflict @ 2231:9a2f4b2e7cf1
gpg extension: Always remove temporary files created by 'hg sigcheck'.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 09 May 2006 13:26:16 +0200 |
parents | 7544700fd931 |
children | e506c14382fd |
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 up -m 1 hg id egrep -v ">>>|<<<" a hg status