--- a/tests/test-mq-merge.t	Wed Jan 04 15:48:02 2012 -0600
+++ b/tests/test-mq-merge.t	Wed Jan 04 17:55:30 2012 -0600
@@ -149,13 +149,11 @@
   -b
   +a
   +c
-  diff --git a/a b/aa
-  copy from a
-  copy to aa
-  --- a/a
+  diff --git a/aa b/aa
+  new file mode 100644
+  --- /dev/null
   +++ b/aa
-  @@ -1,1 +1,1 @@
-  -b
+  @@ -0,0 +1,1 @@
   +a
 
 Check patcha2 is still a regular patch: