view tests/test-merge3 @ 2235:457e4247315d

New make targets: local: build extensions inplace (the former "all" target") all: "local" (for people who expect this) and build everything else install: install pre-built things (so root doesn't have to write to $HOME) install-home: use setup.py's --home option instead of --prefix
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 09 May 2006 18:03:15 +0200
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"