tests/test-merge3
changeset 402 2fe8d66e3075
child 749 7e4843b7efd2
new file mode 100755
--- /dev/null
+++ b/tests/test-merge3
@@ -0,0 +1,10 @@
+#!/bin/sh -x
+
+hg init
+echo This is file a1 > a
+hg add a
+hg commit -t "commit #0" -d "0 0" -u user
+touch b
+hg add b
+rm b
+hg commit -A -t"comment #1" -d "0 0" -u user