Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict @ 1620:6c61646fee5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjusted all but one test output for the new behaviour of localrepo.changes()
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 12 Jan 2006 21:02:38 +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