tests/test-merge3
author Vadim Gelfer <vadim.gelfer@gmail.com>
Fri, 10 Mar 2006 23:34:36 -0800
changeset 1884 4e44ca05a866
parent 814 0902ffece4b4
child 1933 7544700fd931
permissions -rwxr-xr-x
merge with self.

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