Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict @ 2698:c1123e83c8e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: fix qnew and qimport to deal with series file comments qnew and qimport did not take comments into account when deciding where to place new patches in the series file.
author Chris Mason <mason@suse.com>
date Thu, 27 Jul 2006 09:27:42 -0700
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