tests/test-conflict
author TK Soh <teekaysoh@yahoo.com>
Fri, 23 Sep 2005 17:19:35 -0700
changeset 1336 8c094fb47b59
parent 814 0902ffece4b4
child 1925 c71420b186b0
permissions -rwxr-xr-x
hgweb file: fixed left-justified line numbers on IE v6.0 IE (v6.0) seemed to squash the spaces surrounding the line numbers, making them appeared as left- instead of being right-justified. Testing with IE v6.0 and Firefox 1.0.6.

#!/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