Mercurial > hg > pyhgsh
view tests/test-conflict @ 2059:a4c271765415
run-tests: Use appropriate (that is: none) diff options on HP-UX.
author | Sascha Wilde <wilde@sha-bang.de> |
---|---|
date | Wed, 12 Apr 2006 17:53:04 +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