Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-diff-hashes.out @ 4796:83c1bbb934ec
convert: svn merges produce hard-to-trace file entries. Ignore them for now.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Tue, 03 Jul 2007 19:49:36 -0700 |
parents | 2065789f6a3e |
children |
line wrap: on
line source
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