view tests/test-conflict @ 3862:46abbed02b2d

Use UTF-8 in .hg/branch
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 10 Dec 2006 20:35:28 -0200
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