Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict @ 2583:6e5427447f4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
adding local_hostname option to smtp configuration
author Valentino Volonghi aka dialtone <dialtone@divmod.com>
date Sun, 09 Jul 2006 14:12:19 +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