Mercurial > hg > pyhgsh
view tests/test-conflict @ 800:ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 29 Jul 2005 15:19:43 +0100 |
parents | 7e4843b7efd2 |
children | 8f5637f0a0c0 |
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 grep -Ev ">>>|<<<" a hg status