view tests/test-issue612 @ 5417:b8872655f951

hgk: allow any extdiff command for visual diff
author TK Soh <teekaysoh@yahoo.com>
date Mon, 08 Oct 2007 11:18:34 +0800
parents 9797124581c9
children
line wrap: on
line source

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