tests/test-conflict
author Matt Mackall <mpm@selenic.com>
Fri, 29 Dec 2006 20:04:31 -0600
changeset 4006 67982d3ee76c
parent 2283 e506c14382fd
child 4361 46280c004f22
permissions -rwxr-xr-x
symlinks: add flags param to wwrite Now wwrite can set symlink and exec for files

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