tests/test-diff-hashes.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 30 Mar 2009 01:23:12 +0200
changeset 7920 9ea05fbfa7ab
parent 5863 3d1f9dcecdea
permissions -rw-r--r--
merge with backout

found: No such file or directory
not: No such file or directory
quiet:
--- a/foo	Mon Jan 12 13:46:40 1970 +0000
+++ b/foo	Mon Jan 12 13:46:41 1970 +0000
@@ -1,1 +1,1 @@
-bar
+foobar

normal:
diff -r 74de3f1392e2 -r b8b5f023a6ad foo
--- a/foo	Mon Jan 12 13:46:40 1970 +0000
+++ b/foo	Mon Jan 12 13:46:41 1970 +0000
@@ -1,1 +1,1 @@
-bar
+foobar

verbose:
diff -r 74de3f1392e2 -r b8b5f023a6ad foo
--- a/foo	Mon Jan 12 13:46:40 1970 +0000
+++ b/foo	Mon Jan 12 13:46:41 1970 +0000
@@ -1,1 +1,1 @@
-bar
+foobar

debug:
diff -r 74de3f1392e2d67856fb155963441f2610494e1a -r b8b5f023a6ad77fc378bd95cf3fa00cd1414d107 foo
--- a/foo	Mon Jan 12 13:46:40 1970 +0000
+++ b/foo	Mon Jan 12 13:46:41 1970 +0000
@@ -1,1 +1,1 @@
-bar
+foobar