view tests/test-diffdir.out @ 5043:8b1ee1f59b3c

dirstate: improve error message on file/directory clash
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 01 Aug 2007 12:03:10 -0700
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!