tests/test-merge3
author Matt Mackall <mpm@selenic.com>
Tue, 10 Oct 2006 02:15:20 -0500
changeset 3320 b16456909a0a
parent 1933 7544700fd931
permissions -rwxr-xr-x
merge: various tidying update tests to handle corrected output and new workingctx display

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