Mercurial > hg
view tests/test-conflict @ 3868:6033d9f28052
hgweb.cgi and hgwebdir.cgi fixes/cleanups for user configurable parts:
- "import os" was missing in hgwebdir.cgi, added to comments for both script.
- HGENCODING has to be set before importing hgweb, otherwise you'll get
mixed encoding in changelog vs. file content/diffs.
- "import sys" is only needed when changing sys.path
- document purpose of cgitb.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 11 Dec 2006 14:30:50 +0100 |
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