Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-diffdir.out @ 3921:6d0d025e125a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
demandimport: fix import x.y.z as a when x.y is already imported.
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Dec 2006 14:56:12 -0600
parents 000d122071b5
children 4574a8cb080f
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!