diff -r 27572a5cc409 -r 29c8e35d3283 tests/test-diffdir.t
--- a/tests/test-diffdir.t	Thu Jan 14 10:02:34 2016 -0800
+++ b/tests/test-diffdir.t	Thu Jan 14 10:14:24 2016 -0800
@@ -38,3 +38,33 @@
   $ hg diff -r tip -r ""
   hg: parse error: empty query
   [255]
+
+Remove a file that was added via merge. Since the file is not in parent 1,
+it should not be in the diff.
+
+  $ hg ci -m 'a=foo' a
+  $ hg co -Cq null
+  $ echo 123 > b
+  $ hg add b
+  $ hg ci -m "b"
+  created new head
+  $ hg merge 1
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
+  $ hg rm -f a
+  $ hg diff --nodates
+
+Rename a file that was added via merge. Since the rename source is not in
+parent 1, the diff should be relative to /dev/null
+
+  $ hg co -Cq 2
+  $ hg merge 1
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
+  $ hg mv a a2
+  $ hg diff --nodates
+  diff -r cf44b38435e5 a2
+  --- /dev/null
+  +++ b/a2
+  @@ -0,0 +1,1 @@
+  +foo