Mercurial > public > mercurial-scm > hg-stable

view tests/test-diffdir.out @ 9037:a232b90ffb51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compat: remove unnecessary diamond-shaped multiple inheritance
author Alejandro Santos <alejolp@alejolp.com>
date Sun, 05 Jul 2009 11:06:41 +0200
parents c0c4c7b1e8d3
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: 00changelog.i@: ambiguous identifier!
abort: 00changelog.i@: ambiguous identifier!