File: git-conflict-with-base-minus.riff-output

package info (click to toggle)
rust-riffdiff 3.6.0-2
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 5,784 kB
  • sloc: sh: 206; python: 132; makefile: 11
file content (120 lines) | stat: -rw-r--r-- 5,350 bytes parent folder | download 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
 
diff --cc xsrc/token_collector.rs
index b0b23a5,d8d6da8..0000000
--- xsrc/token_collector.rs
+++ xsrc/token_collector.rs
@@@ -34,47 -35,62 +34,95 @@@ pub(crate) struct LineStyle 
  }
  
  pub(crate) const LINE_STYLE_OLD: LineStyle = {
 +    LineStyle {
 +        prefix_style: ANSI_STYLE_NORMAL.with_color(Red),
 +        plain_style: ANSI_STYLE_NORMAL.with_color(Red),
 +        highlighted_style: ANSI_STYLE_NORMAL.with_color(Red).with_inverse(true),
 +    }
 +};
 +
++<<<<<<< HEAD
 +pub(crate) const LINE_STYLE_OLD_FAINT: LineStyle = {
 +    LineStyle {
 +        prefix_style: ANSI_STYLE_NORMAL.with_color(Red).with_weight(Weight::Faint),
 +        plain_style: ANSI_STYLE_NORMAL.with_color(Red).with_weight(Weight::Faint),
 +        highlighted_style: ANSI_STYLE_NORMAL
 +            .with_color(Red)
 +            .with_weight(Weight::Faint)
 +            .with_inverse(true),
 +    }
 +};
 +
++||||||| parent of 980b661 (Remove the adds-only special highlighting feature)
++pub(crate) const LINE_STYLE_OLD_FAINT: LineStyle = {
+     LineStyle {
+         prefix_style: AnsiStyle {
+             inverse: false,
 -            weight: Weight::Normal,
++            weight: Weight::Faint,
+             color: Red,
+         },
+         plain_style: AnsiStyle {
+             inverse: false,
 -            weight: Weight::Normal,
++            weight: Weight::Faint,
+             color: Red,
+         },
+         highlighted_style: AnsiStyle {
+             inverse: true,
 -            weight: Weight::Normal,
++            weight: Weight::Faint,
+             color: Red,
+         },
+     }
+ };
+ 
++=======
++>>>>>>> 980b661 (Remove the adds-only special highlighting feature)
  pub(crate) const LINE_STYLE_NEW: LineStyle = {
 +    LineStyle {
 +        prefix_style: ANSI_STYLE_NORMAL.with_color(Green),
 +        plain_style: ANSI_STYLE_NORMAL.with_color(Green),
 +        highlighted_style: ANSI_STYLE_NORMAL.with_color(Green).with_inverse(true),
 +    }
 +};
 +
++<<<<<<< HEAD
 +pub(crate) const LINE_STYLE_ADDS_ONLY: LineStyle = {
 +    LineStyle {
 +        prefix_style: ANSI_STYLE_NORMAL
 +            .with_color(Green)
 +            .with_weight(Weight::Faint),
 +        plain_style: ANSI_STYLE_NORMAL,
 +        highlighted_style: ANSI_STYLE_NORMAL.with_color(Green).with_inverse(true),
 +    }
 +};
 +
++||||||| parent of 980b661 (Remove the adds-only special highlighting feature)
++pub(crate) const LINE_STYLE_ADDS_ONLY: LineStyle = {
+     LineStyle {
+         prefix_style: AnsiStyle {
+             inverse: false,
 -            weight: Weight::Normal,
++            weight: Weight::Faint,
+             color: Green,
+         },
+         plain_style: AnsiStyle {
+             inverse: false,
+             weight: Weight::Normal,
 -            color: Green,
++            color: Default,
+         },
+         highlighted_style: AnsiStyle {
+             inverse: true,
+             weight: Weight::Normal,
+             color: Green,
+         },
+     }
+ };
+ 
++=======
++>>>>>>> 980b661 (Remove the adds-only special highlighting feature)
  pub(crate) const LINE_STYLE_CONFLICT_BASE: LineStyle = {
      LineStyle {
 -        prefix_style: AnsiStyle {
 -            inverse: true,
 -            weight: Weight::Normal,
 -            color: Default,
 -        },
 -        plain_style: AnsiStyle {
 -            inverse: false,
 -            weight: Weight::Normal,
 -            color: Red,
 -        },
 -        highlighted_style: AnsiStyle {
 -            inverse: true,
 -            weight: Weight::Normal,
 -            color: Red,
 -        },
 +        prefix_style: ANSI_STYLE_NORMAL.with_inverse(true),
 +        plain_style: ANSI_STYLE_NORMAL.with_color(Red),
 +        highlighted_style: ANSI_STYLE_NORMAL.with_color(Red).with_inverse(true),
      }
  };