Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict @ 2164:cbd458228a96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Applied $PWD fix (changeset 278f9b13c39a) to tests/test-hook, too.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 30 Apr 2006 19:30:59 +0200
parents 7544700fd931
children e506c14382fd
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 up -m 1
hg id
egrep -v ">>>|<<<" a
hg status