tests/test-conflict
author TK Soh <teekaysoh@yahoo.com>
Tue, 16 Aug 2005 17:30:41 -0800
changeset 924 ab681ea2857e
parent 814 0902ffece4b4
child 1925 c71420b186b0
permissions -rwxr-xr-x
updated help text and added manpage section for hg paths Index: hg/doc/hg.1.txt ===================================================================

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