Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict @ 3276:105253b30239

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moved hgweb map-* files into their style directories and adjusted them.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 06 Oct 2006 18:38:32 +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