tests/test-diffdir.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Mon, 07 Apr 2008 09:26:40 +0200
changeset 6490 b13dae8ed779
parent 6228 c0c4c7b1e8d3
permissions -rw-r--r--
Merge from crew-stable.

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
abort: 00changelog.i@: ambiguous identifier!
abort: 00changelog.i@: ambiguous identifier!