tests/test-diffdir.out
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
Tue, 21 Feb 2006 15:48:19 -0600
changeset 1773 aae93c3bffb4
parent 1723 fde8fb2cbede
child 1933 7544700fd931
permissions -rw-r--r--
hgmerge: improve "apps not found" message

diff -r 3903775176ed b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
diff -r 3903775176ed b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
diff -r 3903775176ed a
--- a/a
+++ b/a
@@ -0,0 +1,1 @@
+foo
diff -r 3903775176ed b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123