Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-diffdir.out @ 5056:34a54cc5df1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imerge: sorted() is only available in python2.4 and above
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 02 Aug 2007 14:04:51 +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!