Mercurial > hg
view tests/test-conflict @ 762:312b4a10d862
Changed more occurances of 'text' to 'message'.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 22 Jul 2005 16:26:46 +0100 |
parents | 7e4843b7efd2 |
children | ec85f9e6f3b1 8f5637f0a0c0 0902ffece4b4 |
line wrap: on
line source
#!/bin/sh set -x 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" export HGMERGE=merge hg up -m 1 hg id grep -Ev ">>>|<<<" a hg status