Mercurial > hg > pyhgsh

view tests/test-conflict @ 1309:332f225b835c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make debugwalk strip trailing spaces and remove these from test-walk.out
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 21 Sep 2005 08:07:38 +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