tests/test-diffdir.out
author "Mathieu Clabaut <mathieu.clabaut@gmail.com>"
Sat, 15 Jul 2006 13:09:46 +0200
changeset 2633 f7be7babc75a
parent 1933 7544700fd931
child 3822 000d122071b5
permissions -rw-r--r--
[mq]: merge marker

diff -r acd8075edac9 b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
diff -r acd8075edac9 b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
diff -r acd8075edac9 a
--- a/a
+++ b/a
@@ -0,0 +1,1 @@
+foo
diff -r acd8075edac9 b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123