Mercurial > hg > mercurial-crew-with-dirclash

view tests/simple-merge @ 87:b2b3fdbd79f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Verify improvements: Check existence of parents of changesets and manifests Count errors Use ui for display Catch and count unpack exceptions Print error count and exit with non-zero status on error
author mpm@selenic.com
date Tue, 17 May 2005 12:23:53 -0800
parents 9f64ee817199
children
line wrap: on
line source

set -ex
export EDITOR=true
rm -rf test branch

mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit
hg verify
cd ..

cp -a test branch
cd branch
echo bar>>foo
hg commit

cd ../test
hg merge ../branch
hg verify