diff -r b860b116dea4 -r 3d1f9dcecdea tests/test-merge10.out
--- a/tests/test-merge10.out	Tue Jan 15 15:49:24 2008 -0600
+++ b/tests/test-merge10.out	Wed Jan 16 11:14:24 2008 -0600
@@ -14,6 +14,6 @@
 diff -r d02b3fc32762 testdir/subdir/a
 --- a/testdir/subdir/a
 +++ b/testdir/subdir/a
-@@ -1,1 +1,1 @@ a
+@@ -1,1 +1,1 @@
 -a
 +alpha