Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict @ 807:5e779f96edb0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include tests (or possibly maps) ending in numbers in MANIFEST, too.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 29 Jul 2005 22:31:45 +0100
parents ec85f9e6f3b1
children 8f5637f0a0c0
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