Mercurial > hg

view tests/test-diffdir.out @ 2065:2ff37e3bf780

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix update when a locally added file match the target revision the dirstate entry for the added file wasn't updated. fix issue207
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 14 Apr 2006 00:41:50 +0200
parents 7544700fd931
children 000d122071b5
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