Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 3362:887da2247b57
hgweb: Keep session variables (currently only style) in HTML forms, too.
Adjusted default and gitweb template for this.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 11 Oct 2006 20:59:37 +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