##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: fix test results for 07faba78cf5a
Dirkjan Ochtman -
r7437:3cdaac73 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,49 +1,58
1 adding a
1 adding a
2 % default context
2 % default context
3 diff -r cf9f4ba66af2 a
3 diff -r cf9f4ba66af2 a
4 --- a/a
4 --- a/a
5 +++ b/a
5 +++ b/a
6 @@ -2,7 +2,7 @@
6 @@ -2,7 +2,7 @@
7 c
7 c
8 a
8 a
9 a
9 a
10 -b
10 -b
11 +dd
11 +dd
12 a
12 a
13 a
13 a
14 c
14 c
15 % invalid --unified
15 % invalid --unified
16 abort: diff context lines count must be an integer, not 'foo'
16 abort: diff context lines count must be an integer, not 'foo'
17 % --unified=2
17 % --unified=2
18 diff -r cf9f4ba66af2 a
18 diff -r cf9f4ba66af2 a
19 --- a/a
19 --- a/a
20 +++ b/a
20 +++ b/a
21 @@ -3,5 +3,5 @@
21 @@ -3,5 +3,5 @@
22 a
22 a
23 a
23 a
24 -b
24 -b
25 +dd
25 +dd
26 a
26 a
27 a
27 a
28 % diff.unified=2
28 % diff.unified=2
29 diff -r cf9f4ba66af2 a
29 diff -r cf9f4ba66af2 a
30 --- a/a
30 --- a/a
31 +++ b/a
31 +++ b/a
32 @@ -3,5 +3,5 @@
32 @@ -3,5 +3,5 @@
33 a
33 a
34 a
34 a
35 -b
35 -b
36 +dd
36 +dd
37 a
37 a
38 a
38 a
39 % diff.unified=2 --unified=1
39 % diff.unified=2 --unified=1
40 diff -r cf9f4ba66af2 a
40 diff -r cf9f4ba66af2 a
41 --- a/a
41 --- a/a
42 +++ b/a
42 +++ b/a
43 @@ -4,3 +4,3 @@
43 @@ -4,3 +4,3 @@
44 a
44 a
45 -b
45 -b
46 +dd
46 +dd
47 a
47 a
48 % invalid diff.unified
48 % invalid diff.unified
49 abort: diff context lines count must be an integer, not 'foo'
49 abort: diff context lines count must be an integer, not 'foo'
50 % test off-by-one error with diff -p
51 adding a
52 diff -r cb9a9f314b8b a
53 --- a/a Thu Jan 01 00:00:00 1970 +0000
54 +++ b/a Thu Nov 27 17:46:15 2008 +0000
55 @@ -1,0 +1,1 @@
56 +b
57 @@ -2,0 +3,1 @@ a
58 +c
General Comments 0
You need to be logged in to leave comments. Login now