view tests/test-merge3 @ 1971:915b81a35e46

imported patch /home/thomas/fix-incoming-abortion4.patch
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 18 Mar 2006 09:13:27 +0100
parents 7544700fd931
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"
touch b
hg add b
rm b
hg commit -A -m"comment #1" -d "1000000 0"