Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict @ 3897:f47afa2401a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
demandimport: ignore _hashlib and email.mime This makes things work with Python2.5. A better fix would be to fix demandload to use __getattribute__ to be more transparent.
author Matt Mackall <mpm@selenic.com>
date Fri, 15 Dec 2006 12:38:18 -0600
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