diff tests/test-issue612 @ 4838:61343b40a141

Merge with main

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-issue612	Thu Jul 05 14:32:18 2007 -0700
@@ -0,0 +1,24 @@
+#!/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
+