tests/test-conflict
author Sascha Wilde <wilde@sha-bang.de>
Tue, 27 Jun 2006 09:57:06 +0200
changeset 2527 c51fad25e59e
parent 2283 e506c14382fd
child 4365 46280c004f22
permissions -rwxr-xr-x
Split installation targets into install-bin and install-doc. install-bin will only install the program, and install-doc will install the documentation. The main install target still installs both.

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