Mercurial > hg
view tests/test-diff-unified.out @ 6760:4faaa0535ea7
status: clean up all users for unknown files
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 27 Jun 2008 13:43:29 -0500 |
parents | 65029a3aafc2 |
children | 3cdaac732b2b |
line wrap: on
line source
adding a % default context diff -r cf9f4ba66af2 a --- a/a +++ b/a @@ -2,7 +2,7 @@ c a a -b +dd a a c % invalid --unified abort: diff context lines count must be an integer, not 'foo' % --unified=2 diff -r cf9f4ba66af2 a --- a/a +++ b/a @@ -3,5 +3,5 @@ a a -b +dd a a % diff.unified=2 diff -r cf9f4ba66af2 a --- a/a +++ b/a @@ -3,5 +3,5 @@ a a -b +dd a a % diff.unified=2 --unified=1 diff -r cf9f4ba66af2 a --- a/a +++ b/a @@ -4,3 +4,3 @@ a -b +dd a % invalid diff.unified abort: diff context lines count must be an integer, not 'foo'