Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 3543:f7dee427cd14
Turn of "Not trusting file" logging when running hgweb and hgwebdir
(hg serve still shows the warning)
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 26 Oct 2006 19:25:45 +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