tests/test-merge3
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 27 Oct 2006 15:56:34 +0200
changeset 3563 db946221a58a
parent 1933 7544700fd931
child 11177 6a64813276ed
permissions -rwxr-xr-x
Some clarifications for pull/push protocols: - List file:// and static-http:// - Mention that you can pull from bundle files - List http and https as valid push targets, but emphasize that this feature has to be enabled.

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