Show More
@@ -96,7 +96,6 b' class Merge3Text(object):' | |||
|
96 | 96 | mid_marker=b'=======', |
|
97 | 97 | end_marker=b'>>>>>>>', |
|
98 | 98 | base_marker=None, |
|
99 | localorother=None, | |
|
100 | 99 | minimize=False, |
|
101 | 100 | ): |
|
102 | 101 | """Return merge in cvs-like form.""" |
@@ -128,28 +127,21 b' class Merge3Text(object):' | |||
|
128 | 127 | for i in range(t[1], t[2]): |
|
129 | 128 | yield self.b[i] |
|
130 | 129 | elif what == b'conflict': |
|
131 | if localorother == b'local': | |
|
132 | for i in range(t[3], t[4]): | |
|
133 |
|
|
|
134 | elif localorother == b'other': | |
|
135 | for i in range(t[5], t[6]): | |
|
136 | yield self.b[i] | |
|
137 | else: | |
|
138 | self.conflicts = True | |
|
139 | if start_marker is not None: | |
|
140 |
|
|
|
141 | for i in range(t[3], t[4]): | |
|
142 | yield self.a[i] | |
|
143 |
|
|
|
144 |
|
|
|
145 | for i in range(t[1], t[2]): | |
|
146 | yield self.base[i] | |
|
147 | if mid_marker is not None: | |
|
148 | yield mid_marker + newline | |
|
149 | for i in range(t[5], t[6]): | |
|
150 | yield self.b[i] | |
|
151 | if end_marker is not None: | |
|
152 | yield end_marker + newline | |
|
130 | self.conflicts = True | |
|
131 | if start_marker is not None: | |
|
132 | yield start_marker + newline | |
|
133 | for i in range(t[3], t[4]): | |
|
134 | yield self.a[i] | |
|
135 | if base_marker is not None: | |
|
136 | yield base_marker + newline | |
|
137 | for i in range(t[1], t[2]): | |
|
138 | yield self.base[i] | |
|
139 | if mid_marker is not None: | |
|
140 | yield mid_marker + newline | |
|
141 | for i in range(t[5], t[6]): | |
|
142 | yield self.b[i] | |
|
143 | if end_marker is not None: | |
|
144 | yield end_marker + newline | |
|
153 | 145 | else: |
|
154 | 146 | raise ValueError(what) |
|
155 | 147 |
General Comments 0
You need to be logged in to leave comments.
Login now