Mercurial > hg > gitweb

view tests/test-conflict @ 4028:540d1059c802

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundlerepo: it was meant to be revdiff() instead of chunk()
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 15 Jan 2007 17:56:20 +0100
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