Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-diffdir.out @ 2614:8ba1c31f6864

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backout: allow backout of merge changeset with --parent option. --parent allows to choose which parent of merge to revert to.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 14 Jul 2006 23:19:15 -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