Fossil SCM

Fix merge1.test: changed merge conflict warnings. (NOTE: this check-in contains files with merge conflict warnings.)

florian 2023-11-05 12:25 trunk
Commit 4f9cfebf18b43af6feab34373fb61742aeff0933d223dc6e0153e95cf3419d60
Parent 88871c0203eef4d…
1 file changed +24 -24
~ test/merge1.test
M test/merge1.test
+24 -24
--- test/merge1.test
+++ test/merge1.test
@@ -73,30 +73,30 @@
7373
 333 - This is a test of the merging algohm - 3333
7474
 444 - If all goes well, we will be pleased - 4444
7575
 555 - we think it well and other stuff too - 5555
7676
 }
7777
 write_file_indented t23 {
78
- <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
78
+<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<< (line 1)
7979
 111 - This is line ONE of the demo program - 1111
80
- ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||||||
80
+||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 1)
8181
 111 - This is line one of the demo program - 1111
82
- ======= MERGED IN content follows ==================================
82
+======= MERGED IN content follows =============================== (line 1)
8383
 111 - This is line one OF the demo program - 1111
84
- >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
84
+>>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
8585
 222 - The second line program line in code - 2222
8686
 333 - This is a test of the merging algohm - 3333
8787
 444 - If all goes well, we will be pleased - 4444
8888
 555 - we think it well and other stuff too - 5555
8989
 }
9090
 write_file_indented t32 {
91
- <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
91
+<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<< (line 1)
9292
 111 - This is line one OF the demo program - 1111
93
- ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||||||
93
+||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 1)
9494
 111 - This is line one of the demo program - 1111
95
- ======= MERGED IN content follows ==================================
95
+======= MERGED IN content follows =============================== (line 1)
9696
 111 - This is line ONE of the demo program - 1111
97
- >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
97
+>>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
9898
 222 - The second line program line in code - 2222
9999
 333 - This is a test of the merging algohm - 3333
100100
 444 - If all goes well, we will be pleased - 4444
101101
 555 - we think it well and other stuff too - 5555
102102
 }
@@ -158,30 +158,30 @@
158158
 333 - This is a test of the merging algohm - 3333
159159
 444 - If all goes well, we will be pleased - 4444
160160
 555 - we think it well and other stuff too - 5555
161161
 }
162162
 write_file_indented t32 {
163
- <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
164
- ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||||||
163
+<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<< (line 1)
164
+||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 1)
165165
 111 - This is line one of the demo program - 1111
166
- ======= MERGED IN content follows ==================================
166
+======= MERGED IN content follows =============================== (line 1)
167167
 000 - Zero lines added to the beginning of - 0000
168168
 111 - This is line one of the demo program - 1111
169
- >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
169
+>>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
170170
 222 - The second line program line in code - 2222
171171
 333 - This is a test of the merging algohm - 3333
172172
 444 - If all goes well, we will be pleased - 4444
173173
 555 - we think it well and other stuff too - 5555
174174
 }
175175
 write_file_indented t23 {
176
- <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
176
+<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<< (line 1)
177177
 000 - Zero lines added to the beginning of - 0000
178178
 111 - This is line one of the demo program - 1111
179
- ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||||||
179
+||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 1)
180180
 111 - This is line one of the demo program - 1111
181
- ======= MERGED IN content follows ==================================
182
- >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
181
+======= MERGED IN content follows =============================== (line 1)
182
+>>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
183183
 222 - The second line program line in code - 2222
184184
 333 - This is a test of the merging algohm - 3333
185185
 444 - If all goes well, we will be pleased - 4444
186186
 555 - we think it well and other stuff too - 5555
187187
 }
@@ -297,38 +297,38 @@
297297
 STUV
298298
 XYZ.
299299
 }
300300
 write_file_indented t23 {
301301
 abcd
302
- <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
302
+<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<< (line 2)
303303
 efgh 2
304304
 ijkl 2
305305
 mnop 2
306306
 qrst
307307
 uvwx
308308
 yzAB 2
309309
 CDEF 2
310310
 GHIJ 2
311
- ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||||||
311
+||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 2)
312312
 efgh
313313
 ijkl
314314
 mnop
315315
 qrst
316316
 uvwx
317317
 yzAB
318318
 CDEF
319319
 GHIJ
320
- ======= MERGED IN content follows ==================================
320
+======= MERGED IN content follows =============================== (line 2)
321321
 efgh
322322
 ijkl
323323
 mnop 3
324324
 qrst 3
325325
 uvwx 3
326326
 yzAB 3
327327
 CDEF
328328
 GHIJ
329
- >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
329
+>>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
330330
 KLMN
331331
 OPQR
332332
 STUV
333333
 XYZ.
334334
 }
@@ -365,38 +365,38 @@
365365
 STUV
366366
 XYZ.
367367
 }
368368
 write_file_indented t23 {
369369
 abcd
370
- <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
370
+<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<< (line 2)
371371
 efgh 2
372372
 ijkl 2
373373
 mnop
374374
 qrst
375375
 uvwx
376376
 yzAB 2
377377
 CDEF 2
378378
 GHIJ 2
379
- ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||||||
379
+||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 2)
380380
 efgh
381381
 ijkl
382382
 mnop
383383
 qrst
384384
 uvwx
385385
 yzAB
386386
 CDEF
387387
 GHIJ
388
- ======= MERGED IN content follows ==================================
388
+======= MERGED IN content follows =============================== (line 2)
389389
 efgh
390390
 ijkl
391391
 mnop 3
392392
 qrst 3
393393
 uvwx 3
394394
 yzAB 3
395395
 CDEF
396396
 GHIJ
397
- >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
397
+>>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
398398
 KLMN
399399
 OPQR
400400
 STUV
401401
 XYZ.
402402
 }
403403
--- test/merge1.test
+++ test/merge1.test
@@ -73,30 +73,30 @@
73 333 - This is a test of the merging algohm - 3333
74 444 - If all goes well, we will be pleased - 4444
75 555 - we think it well and other stuff too - 5555
76 }
77 write_file_indented t23 {
78 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
79 111 - This is line ONE of the demo program - 1111
80 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||||||
81 111 - This is line one of the demo program - 1111
82 ======= MERGED IN content follows ==================================
83 111 - This is line one OF the demo program - 1111
84 >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
85 222 - The second line program line in code - 2222
86 333 - This is a test of the merging algohm - 3333
87 444 - If all goes well, we will be pleased - 4444
88 555 - we think it well and other stuff too - 5555
89 }
90 write_file_indented t32 {
91 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
92 111 - This is line one OF the demo program - 1111
93 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||||||
94 111 - This is line one of the demo program - 1111
95 ======= MERGED IN content follows ==================================
96 111 - This is line ONE of the demo program - 1111
97 >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
98 222 - The second line program line in code - 2222
99 333 - This is a test of the merging algohm - 3333
100 444 - If all goes well, we will be pleased - 4444
101 555 - we think it well and other stuff too - 5555
102 }
@@ -158,30 +158,30 @@
158 333 - This is a test of the merging algohm - 3333
159 444 - If all goes well, we will be pleased - 4444
160 555 - we think it well and other stuff too - 5555
161 }
162 write_file_indented t32 {
163 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
164 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||||||
165 111 - This is line one of the demo program - 1111
166 ======= MERGED IN content follows ==================================
167 000 - Zero lines added to the beginning of - 0000
168 111 - This is line one of the demo program - 1111
169 >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
170 222 - The second line program line in code - 2222
171 333 - This is a test of the merging algohm - 3333
172 444 - If all goes well, we will be pleased - 4444
173 555 - we think it well and other stuff too - 5555
174 }
175 write_file_indented t23 {
176 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
177 000 - Zero lines added to the beginning of - 0000
178 111 - This is line one of the demo program - 1111
179 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||||||
180 111 - This is line one of the demo program - 1111
181 ======= MERGED IN content follows ==================================
182 >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
183 222 - The second line program line in code - 2222
184 333 - This is a test of the merging algohm - 3333
185 444 - If all goes well, we will be pleased - 4444
186 555 - we think it well and other stuff too - 5555
187 }
@@ -297,38 +297,38 @@
297 STUV
298 XYZ.
299 }
300 write_file_indented t23 {
301 abcd
302 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
303 efgh 2
304 ijkl 2
305 mnop 2
306 qrst
307 uvwx
308 yzAB 2
309 CDEF 2
310 GHIJ 2
311 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||||||
312 efgh
313 ijkl
314 mnop
315 qrst
316 uvwx
317 yzAB
318 CDEF
319 GHIJ
320 ======= MERGED IN content follows ==================================
321 efgh
322 ijkl
323 mnop 3
324 qrst 3
325 uvwx 3
326 yzAB 3
327 CDEF
328 GHIJ
329 >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
330 KLMN
331 OPQR
332 STUV
333 XYZ.
334 }
@@ -365,38 +365,38 @@
365 STUV
366 XYZ.
367 }
368 write_file_indented t23 {
369 abcd
370 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
371 efgh 2
372 ijkl 2
373 mnop
374 qrst
375 uvwx
376 yzAB 2
377 CDEF 2
378 GHIJ 2
379 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||||||
380 efgh
381 ijkl
382 mnop
383 qrst
384 uvwx
385 yzAB
386 CDEF
387 GHIJ
388 ======= MERGED IN content follows ==================================
389 efgh
390 ijkl
391 mnop 3
392 qrst 3
393 uvwx 3
394 yzAB 3
395 CDEF
396 GHIJ
397 >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
398 KLMN
399 OPQR
400 STUV
401 XYZ.
402 }
403
--- test/merge1.test
+++ test/merge1.test
@@ -73,30 +73,30 @@
73 333 - This is a test of the merging algohm - 3333
74 444 - If all goes well, we will be pleased - 4444
75 555 - we think it well and other stuff too - 5555
76 }
77 write_file_indented t23 {
78 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<< (line 1)
79 111 - This is line ONE of the demo program - 1111
80 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 1)
81 111 - This is line one of the demo program - 1111
82 ======= MERGED IN content follows =============================== (line 1)
83 111 - This is line one OF the demo program - 1111
84 >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
85 222 - The second line program line in code - 2222
86 333 - This is a test of the merging algohm - 3333
87 444 - If all goes well, we will be pleased - 4444
88 555 - we think it well and other stuff too - 5555
89 }
90 write_file_indented t32 {
91 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<< (line 1)
92 111 - This is line one OF the demo program - 1111
93 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 1)
94 111 - This is line one of the demo program - 1111
95 ======= MERGED IN content follows =============================== (line 1)
96 111 - This is line ONE of the demo program - 1111
97 >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
98 222 - The second line program line in code - 2222
99 333 - This is a test of the merging algohm - 3333
100 444 - If all goes well, we will be pleased - 4444
101 555 - we think it well and other stuff too - 5555
102 }
@@ -158,30 +158,30 @@
158 333 - This is a test of the merging algohm - 3333
159 444 - If all goes well, we will be pleased - 4444
160 555 - we think it well and other stuff too - 5555
161 }
162 write_file_indented t32 {
163 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<< (line 1)
164 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 1)
165 111 - This is line one of the demo program - 1111
166 ======= MERGED IN content follows =============================== (line 1)
167 000 - Zero lines added to the beginning of - 0000
168 111 - This is line one of the demo program - 1111
169 >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
170 222 - The second line program line in code - 2222
171 333 - This is a test of the merging algohm - 3333
172 444 - If all goes well, we will be pleased - 4444
173 555 - we think it well and other stuff too - 5555
174 }
175 write_file_indented t23 {
176 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<< (line 1)
177 000 - Zero lines added to the beginning of - 0000
178 111 - This is line one of the demo program - 1111
179 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 1)
180 111 - This is line one of the demo program - 1111
181 ======= MERGED IN content follows =============================== (line 1)
182 >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
183 222 - The second line program line in code - 2222
184 333 - This is a test of the merging algohm - 3333
185 444 - If all goes well, we will be pleased - 4444
186 555 - we think it well and other stuff too - 5555
187 }
@@ -297,38 +297,38 @@
297 STUV
298 XYZ.
299 }
300 write_file_indented t23 {
301 abcd
302 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<< (line 2)
303 efgh 2
304 ijkl 2
305 mnop 2
306 qrst
307 uvwx
308 yzAB 2
309 CDEF 2
310 GHIJ 2
311 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 2)
312 efgh
313 ijkl
314 mnop
315 qrst
316 uvwx
317 yzAB
318 CDEF
319 GHIJ
320 ======= MERGED IN content follows =============================== (line 2)
321 efgh
322 ijkl
323 mnop 3
324 qrst 3
325 uvwx 3
326 yzAB 3
327 CDEF
328 GHIJ
329 >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
330 KLMN
331 OPQR
332 STUV
333 XYZ.
334 }
@@ -365,38 +365,38 @@
365 STUV
366 XYZ.
367 }
368 write_file_indented t23 {
369 abcd
370 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<< (line 2)
371 efgh 2
372 ijkl 2
373 mnop
374 qrst
375 uvwx
376 yzAB 2
377 CDEF 2
378 GHIJ 2
379 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 2)
380 efgh
381 ijkl
382 mnop
383 qrst
384 uvwx
385 yzAB
386 CDEF
387 GHIJ
388 ======= MERGED IN content follows =============================== (line 2)
389 efgh
390 ijkl
391 mnop 3
392 qrst 3
393 uvwx 3
394 yzAB 3
395 CDEF
396 GHIJ
397 >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
398 KLMN
399 OPQR
400 STUV
401 XYZ.
402 }
403

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button