Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict @ 1707:33d09f4a6fef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Put the empty line in commit text above the branch merge line.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 09 Feb 2006 07:14:05 +0100
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