Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
6459:8189e03adb44 | 6467:65029a3aafc2 |
---|---|
1 adding a | |
2 % default context | |
3 diff -r cf9f4ba66af2 a | |
4 --- a/a | |
5 +++ b/a | |
6 @@ -2,7 +2,7 @@ | |
7 c | |
8 a | |
9 a | |
10 -b | |
11 +dd | |
12 a | |
13 a | |
14 c | |
15 % invalid --unified | |
16 abort: diff context lines count must be an integer, not 'foo' | |
17 % --unified=2 | |
18 diff -r cf9f4ba66af2 a | |
19 --- a/a | |
20 +++ b/a | |
21 @@ -3,5 +3,5 @@ | |
22 a | |
23 a | |
24 -b | |
25 +dd | |
26 a | |
27 a | |
28 % diff.unified=2 | |
29 diff -r cf9f4ba66af2 a | |
30 --- a/a | |
31 +++ b/a | |
32 @@ -3,5 +3,5 @@ | |
33 a | |
34 a | |
35 -b | |
36 +dd | |
37 a | |
38 a | |
39 % diff.unified=2 --unified=1 | |
40 diff -r cf9f4ba66af2 a | |
41 --- a/a | |
42 +++ b/a | |
43 @@ -4,3 +4,3 @@ | |
44 a | |
45 -b | |
46 +dd | |
47 a | |
48 % invalid diff.unified | |
49 abort: diff context lines count must be an integer, not 'foo' |