tests/test-merge4
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 26 Jun 2007 22:38:57 +0200
changeset 4730 eadfaa9ec487
parent 2283 e506c14382fd
permissions -rwxr-xr-x
Updated command tables in commands.py and hgext extensions. - Marked for translation where extensions already had _() - Corrected indentation - fixed a few synopsises

#!/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"