tests/test-diffdir.out
author Brendan Cully <brendan@kublai.com>
Sat, 10 Mar 2007 17:36:29 -0800
changeset 4176 fc12ac3755d5
parent 4167 4574a8cb080f
child 4208 f80cf8b7bbd9
permissions -rw-r--r--
Test update to branch tip

diff -r 4da5fa99f904 b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
diff -r 4da5fa99f904 b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
diff -r 4da5fa99f904 a
--- a/a
+++ b/a
@@ -0,0 +1,1 @@
+foo
diff -r 4da5fa99f904 b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
abort: Ambiguous identifier!
abort: Ambiguous identifier!