tests/test-merge3
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 11 Aug 2007 12:36:04 +0200
changeset 5143 fc6106267198
parent 1933 7544700fd931
permissions -rwxr-xr-x
Hide absolute path from test-no-symlinks output. And add missing eol and remove trailing space which where introduced by the patches adding this test.

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