tests/test-diffdir.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Fri, 14 Jul 2006 23:19:15 -0700
changeset 2614 8ba1c31f6864
parent 1933 7544700fd931
child 3822 000d122071b5
permissions -rw-r--r--
backout: allow backout of merge changeset with --parent option. --parent allows to choose which parent of merge to revert to.

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