Mercurial > hg > pyhgsh

view tests/test-conflict @ 1174:9d9f4973c76a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added missing 'import errno', and use errno for EPIPE, too.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 31 Aug 2005 09:01:41 +0200
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