tests/test-hgrc
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 11 Dec 2006 18:09:52 +0100
changeset 3869 ad6f34c83c3d
parent 1473 7d66ce9895fa
child 4659 7a7d4937272b
permissions -rwxr-xr-x
Add instructions how to redo/finish failed merge with local working directory. b2ae81a7df29 already implemented this for branch merges.

#!/bin/sh

mkdir t
cd t
hg init
echo "invalid" > .hg/hgrc
hg status 2>&1 |sed -e "s:/.*\(/t/.*\):...\1:"