view tests/test-diffdir.out @ 5460:fe9b0bb3eb1c

merge with goto
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 12 Oct 2007 11:23:03 +0200
parents f80cf8b7bbd9
children
line wrap: on
line source

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: Ambiguous identifier!
abort: Ambiguous identifier!