Mercurial > hg
view tests/test-conflict @ 2110:25a8d116ab6a
Add a pure python version of run-tests.
If this works well for most people, it should replace the shell version
of run-test.
author | Stephen Darnell <stephen@darnell.plus.com> |
---|---|
date | Fri, 21 Apr 2006 18:47:55 +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