tests/test-issue612
author Pascal Quantin <pascal.quantin@gmail.com>
Fri, 23 Jan 2009 23:39:28 +0100
changeset 7683 39ae4fb8cf17
parent 4819 9797124581c9
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
mkdir src
echo a > src/a.c
hg ci -Ama -d "10000000 0"

hg mv src source
hg ci -Ammove -d "1000000 0"

hg co -C 0
echo new > src/a.c
echo compiled > src/a.o
hg ci -mupdate -d "1000000 0"

hg st

hg merge

hg st