Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-diffdir.out @ 2757:787e18b84893

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge patches from brendan cully that did not apply clean against tip.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 01 Aug 2006 15:40:28 -0700
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