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 Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Fri, 29 Dec 2006 06:37:43 +0100
changeset 4014 509342f95564
parent 3822 000d122071b5
child 4167 4574a8cb080f
permissions -rw-r--r--
various doc fixes - update can no longer be used to merge - short summary start with lowercase - add merge to short help list - fix tests

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