Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-conflict @ 1925:c71420b186b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
small solaris portability fixes from John Levon <levon@movementarian.org>
author Peter van Dijk <peter@dataloss.nl>
date Wed, 22 Feb 2006 15:42:48 +0100
parents 0902ffece4b4
children 7544700fd931
comparison
equal deleted inserted replaced
1924:46fb38ef9a91 1925:c71420b186b0
10 echo "something else" > a 10 echo "something else" > a
11 hg commit -m branch2 -d "0 0" 11 hg commit -m branch2 -d "0 0"
12 HGMERGE=merge; export HGMERGE 12 HGMERGE=merge; export HGMERGE
13 hg up -m 1 13 hg up -m 1
14 hg id 14 hg id
15 grep -Ev ">>>|<<<" a 15 egrep -v ">>>|<<<" a
16 hg status 16 hg status