Mercurial > hg
diff tests/test-diff-hashes.out @ 3387:2065789f6a3e
use short hashes with diff -v
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 13 Oct 2006 15:34:35 -0300 |
parents | |
children | c2d0ed7f4af8 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-diff-hashes.out Fri Oct 13 15:34:35 2006 -0300 @@ -0,0 +1,31 @@ +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 +-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 +-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 +-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 +-bar ++foobar +