tests/test-merge3
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Fri, 29 Dec 2006 06:37:43 +0100
changeset 4014 509342f95564
parent 1933 7544700fd931
permissions -rwxr-xr-x
various doc fixes - update can no longer be used to merge - short summary start with lowercase - add merge to short help list - fix tests

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