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

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

color: fix test-diff-color breakage
Matt Mackall -
r11751:b8b4a241 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,63 +1,63
1 1 adding a
2 2 % default context
3 3 diff -r cf9f4ba66af2 a
4 4 --- a/a
5 5 +++ b/a
6 6 @@ -2,7 +2,7 @@
7 7 c
8 8 a
9 9 a
10 10 -b
11 11 +dd
12 12 a
13 13 a
14 14 c
15 15 % --unified=2
16 16 diff -r cf9f4ba66af2 a
17 17 --- a/a
18 18 +++ b/a
19 19 @@ -3,5 +3,5 @@
20 20 a
21 21 a
22 22 -b
23 23 +dd
24 24 a
25 25 a
26 26 % diffstat
27 27 a | 2 +-
28 28 1 files changed, 1 insertions(+), 1 deletions(-)
29 29 % record
30 30 diff --git a/a b/a
31 31 old mode 100644
32 32 new mode 100755
33 1 hunks, 2 lines changed
33 1 hunks, 1 lines changed
34 34 examine changes to 'a'? [Ynsfdaq?]
35 35 @@ -2,7 +2,7 @@
36 36 c
37 37 a
38 38 a
39 39 -b
40 40 +dd
41 41 a
42 42 a
43 43 c
44 44 record this change to 'a'? [Ynsfdaq?]
45 45
46 46 rolling back to revision 0 (undo commit)
47 47 % qrecord
48 48 diff --git a/a b/a
49 49 old mode 100644
50 50 new mode 100755
51 1 hunks, 2 lines changed
51 1 hunks, 1 lines changed
52 52 examine changes to 'a'? [Ynsfdaq?]
53 53 @@ -2,7 +2,7 @@
54 54 c
55 55 a
56 56 a
57 57 -b
58 58 +dd
59 59 a
60 60 a
61 61 c
62 62 record this change to 'a'? [Ynsfdaq?]
63 63
General Comments 0
You need to be logged in to leave comments. Login now