--- a/tests/test-transplant	Sun May 25 13:39:08 2008 -0700
+++ b/tests/test-transplant	Wed May 28 22:45:07 2008 +0200
@@ -96,3 +96,21 @@
 hg transplant --continue
 hg transplant 1:3
 hg locate
+cd ..
+
+# Test transplant --merge (issue 1111)
+echo % test transplant merge
+hg init t1111
+cd t1111
+echo a > a
+hg ci -Am adda
+echo b >> a
+hg ci -m appendb
+echo c >> a
+hg ci -m appendc
+hg up -C 0
+echo d >> a
+hg ci -m appendd
+echo % tranplant
+hg transplant -m 1
+cd ..