Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict @ 1252:94f38724283f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
The copy tests don't need to invoke cp any longer.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 14 Sep 2005 16:31:03 -0700
parents 0902ffece4b4
children c71420b186b0
line wrap: on
line source

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "0 0"
echo "something" > a
hg commit -m branch1 -d "0 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "0 0"
HGMERGE=merge; export HGMERGE
hg up -m 1
hg id
grep -Ev ">>>|<<<" a
hg status