Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-diffdir.out
author Matt Mackall <mpm@selenic.com>
Thu, 05 Jul 2007 13:34:18 -0500
changeset 4815 8808ea7da86b
parent 4208 f80cf8b7bbd9
permissions -rw-r--r--
merge: make test for fast-forward merge stricter (issue619) don't allow merging with an ancestor fix != on contexts add a test

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!
mercurial-crew-with-dirclash