equal
deleted
inserted
replaced
146 |
146 |
147 $ python simplemerge -p conflict-local base conflict-other |
147 $ python simplemerge -p conflict-local base conflict-other |
148 base |
148 base |
149 <<<<<<< conflict-local |
149 <<<<<<< conflict-local |
150 not other |
150 not other |
151 end |
151 ======= |
152 ======= |
152 other |
153 other |
|
154 end |
|
155 >>>>>>> conflict-other |
153 >>>>>>> conflict-other |
|
154 end |
156 [1] |
155 [1] |
157 |
156 |
158 1 label |
157 1 label |
159 |
158 |
160 $ python simplemerge -p -L foo conflict-local base conflict-other |
159 $ python simplemerge -p -L foo conflict-local base conflict-other |
161 base |
160 base |
162 <<<<<<< foo |
161 <<<<<<< foo |
163 not other |
162 not other |
164 end |
163 ======= |
165 ======= |
164 other |
166 other |
|
167 end |
|
168 >>>>>>> conflict-other |
165 >>>>>>> conflict-other |
|
166 end |
169 [1] |
167 [1] |
170 |
168 |
171 2 labels |
169 2 labels |
172 |
170 |
173 $ python simplemerge -p -L foo -L bar conflict-local base conflict-other |
171 $ python simplemerge -p -L foo -L bar conflict-local base conflict-other |
174 base |
172 base |
175 <<<<<<< foo |
173 <<<<<<< foo |
176 not other |
174 not other |
177 end |
175 ======= |
178 ======= |
176 other |
179 other |
|
180 end |
|
181 >>>>>>> bar |
177 >>>>>>> bar |
|
178 end |
182 [1] |
179 [1] |
183 |
180 |
184 3 labels |
181 3 labels |
185 |
182 |
186 $ python simplemerge -p -L foo -L bar -L base conflict-local base conflict-other |
183 $ python simplemerge -p -L foo -L bar -L base conflict-local base conflict-other |