Mercurial > hg
view tests/test-conflict @ 1441:cbc36ad70945
hgweb: a couple of fixes on search page
- show search string in the bottom search box
- wrap search boxes within paragraphs, this also puts
some space between last changeset and bottom
search box in firefox.
author | TK Soh <teekaysoh@yahoo.com> |
---|---|
date | Mon, 24 Oct 2005 17:54:06 -0700 |
parents | 0902ffece4b4 |
children | c71420b186b0 |
line wrap: on
line source
#!/bin/sh 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" HGMERGE=merge; export HGMERGE hg up -m 1 hg id grep -Ev ">>>|<<<" a hg status