tests/test-merge3
author "Mathieu Clabaut <mathieu.clabaut@gmail.com>"
Sat, 15 Jul 2006 13:09:46 +0200
changeset 2633 f7be7babc75a
parent 1933 7544700fd931
permissions -rwxr-xr-x
[mq]: merge marker

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