tests/test-diffdir.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 13 Mar 2006 08:56:59 +0100
changeset 1922 6d50d6189269
parent 1723 fde8fb2cbede
child 1933 7544700fd931
permissions -rw-r--r--
ui: output the number of file updated/merged/removed/... on update add a note for people to remember commiting after a merge.

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