tests/test-issue619
author Pascal Quantin <pascal.quantin@gmail.com>
Fri, 23 Jan 2009 23:39:28 +0100
changeset 7683 39ae4fb8cf17
parent 4748 8808ea7da86b
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
Retrieve Beyond Compare's path from registry Switch from a hardcoded path to registry key to find Beyond Compare's executable. Calling BCompare.exe works fine with version 3.0.14.

#!/bin/sh

mkdir t
cd t
hg init
echo a > a
hg ci -Ama -d '1000000000 0'
echo b > b
hg branch b
hg ci -Amb -d '1000000000 0'
hg co -C 0

echo fast-forward
hg merge b
hg ci -Ammerge -d '1000000000 0'

echo bogus fast-forward should fail
hg merge b

echo done