view tests/test-merge3 @ 1105:a906b018eaef

Replaced hg status -p/--strip with -n/--no-status to not confuse with patch.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 27 Aug 2005 23:23:32 +0200
parents 0902ffece4b4
children 7544700fd931
line wrap: on
line source

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "0 0"
touch b
hg add b
rm b
hg commit -A -m"comment #1" -d "0 0"