Mercurial Mercurial > mercurial / 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 Sune Foldager <cryo@cyanite.org>
Wed, 14 Apr 2010 19:11:35 +0200
branchstable
changeset 10908 816bac2f9452
parent 6228 c0c4c7b1e8d3
permissions -rw-r--r--
prepush: fix bug in warning message selection In certain situations you would be told "you should pull and merge" even when there is nothing to pull.

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!
mercurial