mirror of
https://github.com/facebook/sapling.git
synced 2024-10-04 22:07:44 +03:00
23 lines
221 B
Plaintext
23 lines
221 B
Plaintext
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
|
|
|