Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 2669:b013c9daae69
Include all tests/*.py files in the MANIFEST so tests won't fail on tarballs.
This fixes failing test-http-proxy and test-webraw.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 25 Jul 2006 17:54:58 +0200 |
parents | e506c14382fd |
children | 46280c004f22 |
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 merge 1 hg id egrep -v ">>>|<<<" a hg status