Mercurial > public > mercurial-scm > hg-stable
diff tests/test-diff-unified.out @ 6467:65029a3aafc2
Let --unified default to diff.unified (issue 1076)
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 04 Apr 2008 22:15:14 +0200 |
parents | |
children | 3cdaac732b2b |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-diff-unified.out Fri Apr 04 22:15:14 2008 +0200 @@ -0,0 +1,49 @@ +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'