view tests/test-merge4 @ 9907:f1ee8009fe10

i18n-sv: translated seven commands These commands has been translated: addremove, archive, backout, config, unbundle, verify, version
author Jens Bäckman <jens.backman@gmail.com>
date Sun, 22 Nov 2009 19:37:19 +0100
parents e506c14382fd
children
line wrap: on
line source

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