Mercurial > hg > mercurial-crew-with-dirclash

view tests/simple-merge @ 103:33500fe7d56c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
adding subdir support for log and status commands
author jake@edge2.net
date Sun, 15 May 2005 15:30:36 -0700
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