view tests/test-conflict @ 3690:97d2c1909f98

Make qrefresh help more explanatory for options -m, -l and -s
author Mathieu Clabaut <mathieu.clabaut@gmail.com>
date Sun, 19 Nov 2006 22:02:00 +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