view tests/test-merge3 @ 718:7dae73778114

Fix typos in FAQ
author jdc@uwo.ca
date Sun, 17 Jul 2005 08:39:44 +0100
parents 2fe8d66e3075
children 7e4843b7efd2
line wrap: on
line source

#!/bin/sh -x

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