Mercurial > hg
view tests/test-conflict @ 2165:d821918e3bee
Use better names (hg-{usage}-{random}.{suffix}) for temporary files.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sun, 30 Apr 2006 21:11:22 +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