view tests/test-merge4 @ 6208:c88b9e597588

tests: add --keep-tmp to run-tests.py to debug test environment

When set, you can find the working dir of the test run as a
uniquely named subdirectory of --tmpdir so you can inspect
it.

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "1000000 0"
hg update 0
echo This is file c1 > c
hg add c
hg commit -m "commit #2" -d "1000000 0"
hg merge 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "1000000 0"