Artifact 310813fc4c32766f376ef7a676f5a3d3b8cf8d9b:
File
test/merge1.test
part of check-in
[81122988ba]
- More improvements to the 3-way merge. Additional test cases added.
by
drh on
2009-03-21 19:18:22.
0000: 23 0a 23 20 43 6f 70 79 72 69 67 68 74 20 28 63 #.# Copyright (c
0010: 29 20 32 30 30 36 20 44 2e 20 52 69 63 68 61 72 ) 2006 D. Richar
0020: 64 20 48 69 70 70 0a 23 0a 23 20 54 68 69 73 20 d Hipp.#.# This
0030: 70 72 6f 67 72 61 6d 20 69 73 20 66 72 65 65 20 program is free
0040: 73 6f 66 74 77 61 72 65 3b 20 79 6f 75 20 63 61 software; you ca
0050: 6e 20 72 65 64 69 73 74 72 69 62 75 74 65 20 69 n redistribute i
0060: 74 20 61 6e 64 2f 6f 72 0a 23 20 6d 6f 64 69 66 t and/or.# modif
0070: 79 20 69 74 20 75 6e 64 65 72 20 74 68 65 20 74 y it under the t
0080: 65 72 6d 73 20 6f 66 20 74 68 65 20 47 4e 55 20 erms of the GNU
0090: 47 65 6e 65 72 61 6c 20 50 75 62 6c 69 63 0a 23 General Public.#
00a0: 20 4c 69 63 65 6e 73 65 20 76 65 72 73 69 6f 6e License version
00b0: 20 32 20 61 73 20 70 75 62 6c 69 73 68 65 64 20 2 as published
00c0: 62 79 20 74 68 65 20 46 72 65 65 20 53 6f 66 74 by the Free Soft
00d0: 77 61 72 65 20 46 6f 75 6e 64 61 74 69 6f 6e 2e ware Foundation.
00e0: 0a 23 0a 23 20 54 68 69 73 20 70 72 6f 67 72 61 .#.# This progra
00f0: 6d 20 69 73 20 64 69 73 74 72 69 62 75 74 65 64 m is distributed
0100: 20 69 6e 20 74 68 65 20 68 6f 70 65 20 74 68 61 in the hope tha
0110: 74 20 69 74 20 77 69 6c 6c 20 62 65 20 75 73 65 t it will be use
0120: 66 75 6c 2c 0a 23 20 62 75 74 20 57 49 54 48 4f ful,.# but WITHO
0130: 55 54 20 41 4e 59 20 57 41 52 52 41 4e 54 59 3b UT ANY WARRANTY;
0140: 20 77 69 74 68 6f 75 74 20 65 76 65 6e 20 74 68 without even th
0150: 65 20 69 6d 70 6c 69 65 64 20 77 61 72 72 61 6e e implied warran
0160: 74 79 20 6f 66 0a 23 20 4d 45 52 43 48 41 4e 54 ty of.# MERCHANT
0170: 41 42 49 4c 49 54 59 20 6f 72 20 46 49 54 4e 45 ABILITY or FITNE
0180: 53 53 20 46 4f 52 20 41 20 50 41 52 54 49 43 55 SS FOR A PARTICU
0190: 4c 41 52 20 50 55 52 50 4f 53 45 2e 20 20 53 65 LAR PURPOSE. Se
01a0: 65 20 74 68 65 20 47 4e 55 0a 23 20 47 65 6e 65 e the GNU.# Gene
01b0: 72 61 6c 20 50 75 62 6c 69 63 20 4c 69 63 65 6e ral Public Licen
01c0: 73 65 20 66 6f 72 20 6d 6f 72 65 20 64 65 74 61 se for more deta
01d0: 69 6c 73 2e 0a 23 20 0a 23 20 59 6f 75 20 73 68 ils..# .# You sh
01e0: 6f 75 6c 64 20 68 61 76 65 20 72 65 63 65 69 76 ould have receiv
01f0: 65 64 20 61 20 63 6f 70 79 20 6f 66 20 74 68 65 ed a copy of the
0200: 20 47 4e 55 20 47 65 6e 65 72 61 6c 20 50 75 62 GNU General Pub
0210: 6c 69 63 0a 23 20 4c 69 63 65 6e 73 65 20 61 6c lic.# License al
0220: 6f 6e 67 20 77 69 74 68 20 74 68 69 73 20 6c 69 ong with this li
0230: 62 72 61 72 79 3b 20 69 66 20 6e 6f 74 2c 20 77 brary; if not, w
0240: 72 69 74 65 20 74 6f 20 74 68 65 0a 23 20 46 72 rite to the.# Fr
0250: 65 65 20 53 6f 66 74 77 61 72 65 20 46 6f 75 6e ee Software Foun
0260: 64 61 74 69 6f 6e 2c 20 49 6e 63 2e 2c 20 35 39 dation, Inc., 59
0270: 20 54 65 6d 70 6c 65 20 50 6c 61 63 65 20 2d 20 Temple Place -
0280: 53 75 69 74 65 20 33 33 30 2c 0a 23 20 42 6f 73 Suite 330,.# Bos
0290: 74 6f 6e 2c 20 4d 41 20 20 30 32 31 31 31 2d 31 ton, MA 02111-1
02a0: 33 30 37 2c 20 55 53 41 2e 0a 23 0a 23 20 41 75 307, USA..#.# Au
02b0: 74 68 6f 72 20 63 6f 6e 74 61 63 74 20 69 6e 66 thor contact inf
02c0: 6f 72 6d 61 74 69 6f 6e 3a 0a 23 20 20 20 64 72 ormation:.# dr
02d0: 68 40 68 77 61 63 69 2e 63 6f 6d 0a 23 20 20 20 h@hwaci.com.#
02e0: 68 74 74 70 3a 2f 2f 77 77 77 2e 68 77 61 63 69 http://www.hwaci
02f0: 2e 63 6f 6d 2f 64 72 68 2f 0a 23 0a 23 23 23 23 .com/drh/.#.####
0300: 23 23 23 23 23 23 23 23 23 23 23 23 23 23 23 23 ################
0310: 23 23 23 23 23 23 23 23 23 23 23 23 23 23 23 23 ################
0320: 23 23 23 23 23 23 23 23 23 23 23 23 23 23 23 23 ################
0330: 23 23 23 23 23 23 23 23 23 23 23 23 23 23 23 23 ################
0340: 23 23 23 23 23 23 23 23 0a 23 0a 23 20 54 65 73 ########.#.# Tes
0350: 74 73 20 6f 66 20 74 68 65 20 33 2d 77 61 79 20 ts of the 3-way
0360: 6d 65 72 67 65 0a 23 0a 0a 77 72 69 74 65 5f 66 merge.#..write_f
0370: 69 6c 65 5f 69 6e 64 65 6e 74 65 64 20 74 31 20 ile_indented t1
0380: 7b 0a 20 20 31 31 31 20 2d 20 54 68 69 73 20 69 {. 111 - This i
0390: 73 20 6c 69 6e 65 20 6f 6e 65 20 6f 66 20 74 68 s line one of th
03a0: 65 20 64 65 6d 6f 20 70 72 6f 67 72 61 6d 20 2d e demo program -
03b0: 20 31 31 31 31 0a 20 20 32 32 32 20 2d 20 54 68 1111. 222 - Th
03c0: 65 20 73 65 63 6f 6e 64 20 6c 69 6e 65 20 70 72 e second line pr
03d0: 6f 67 72 61 6d 20 6c 69 6e 65 20 69 6e 20 63 6f ogram line in co
03e0: 64 65 20 2d 20 32 32 32 32 0a 20 20 33 33 33 20 de - 2222. 333
03f0: 2d 20 54 68 69 73 20 69 73 20 61 20 74 65 73 74 - This is a test
0400: 20 6f 66 20 74 68 65 20 6d 65 72 67 69 6e 67 20 of the merging
0410: 61 6c 67 6f 68 6d 20 2d 20 33 33 33 33 0a 20 20 algohm - 3333.
0420: 34 34 34 20 2d 20 49 66 20 61 6c 6c 20 67 6f 65 444 - If all goe
0430: 73 20 77 65 6c 6c 2c 20 77 65 20 77 69 6c 6c 20 s well, we will
0440: 62 65 20 70 6c 65 61 73 65 64 20 2d 20 34 34 34 be pleased - 444
0450: 34 0a 20 20 35 35 35 20 2d 20 77 65 20 74 68 69 4. 555 - we thi
0460: 6e 6b 20 69 74 20 77 65 6c 6c 20 61 6e 64 20 6f nk it well and o
0470: 74 68 65 72 20 73 74 75 66 66 20 74 6f 6f 20 2d ther stuff too -
0480: 20 35 35 35 35 0a 7d 0a 77 72 69 74 65 5f 66 69 5555.}.write_fi
0490: 6c 65 5f 69 6e 64 65 6e 74 65 64 20 74 32 20 7b le_indented t2 {
04a0: 0a 20 20 31 31 31 20 2d 20 54 68 69 73 20 69 73 . 111 - This is
04b0: 20 6c 69 6e 65 20 4f 4e 45 20 6f 66 20 74 68 65 line ONE of the
04c0: 20 64 65 6d 6f 20 70 72 6f 67 72 61 6d 20 2d 20 demo program -
04d0: 31 31 31 31 0a 20 20 32 32 32 20 2d 20 54 68 65 1111. 222 - The
04e0: 20 73 65 63 6f 6e 64 20 6c 69 6e 65 20 70 72 6f second line pro
04f0: 67 72 61 6d 20 6c 69 6e 65 20 69 6e 20 63 6f 64 gram line in cod
0500: 65 20 2d 20 32 32 32 32 0a 20 20 33 33 33 20 2d e - 2222. 333 -
0510: 20 54 68 69 73 20 69 73 20 61 20 74 65 73 74 20 This is a test
0520: 6f 66 20 74 68 65 20 6d 65 72 67 69 6e 67 20 61 of the merging a
0530: 6c 67 6f 68 6d 20 2d 20 33 33 33 33 0a 20 20 34 lgohm - 3333. 4
0540: 34 34 20 2d 20 49 66 20 61 6c 6c 20 67 6f 65 73 44 - If all goes
0550: 20 77 65 6c 6c 2c 20 77 65 20 77 69 6c 6c 20 62 well, we will b
0560: 65 20 70 6c 65 61 73 65 64 20 2d 20 34 34 34 34 e pleased - 4444
0570: 0a 20 20 35 35 35 20 2d 20 77 65 20 74 68 69 6e . 555 - we thin
0580: 6b 20 69 74 20 77 65 6c 6c 20 61 6e 64 20 6f 74 k it well and ot
0590: 68 65 72 20 73 74 75 66 66 20 74 6f 6f 20 2d 20 her stuff too -
05a0: 35 35 35 35 0a 7d 0a 77 72 69 74 65 5f 66 69 6c 5555.}.write_fil
05b0: 65 5f 69 6e 64 65 6e 74 65 64 20 74 33 20 7b 0a e_indented t3 {.
05c0: 20 20 31 31 31 20 2d 20 54 68 69 73 20 69 73 20 111 - This is
05d0: 6c 69 6e 65 20 6f 6e 65 20 6f 66 20 74 68 65 20 line one of the
05e0: 64 65 6d 6f 20 70 72 6f 67 72 61 6d 20 2d 20 31 demo program - 1
05f0: 31 31 31 0a 20 20 32 32 32 20 2d 20 54 68 65 20 111. 222 - The
0600: 73 65 63 6f 6e 64 20 6c 69 6e 65 20 70 72 6f 67 second line prog
0610: 72 61 6d 20 6c 69 6e 65 20 69 6e 20 63 6f 64 65 ram line in code
0620: 20 2d 20 32 32 32 32 0a 20 20 33 33 33 20 2d 20 - 2222. 333 -
0630: 54 68 69 73 20 69 73 20 61 20 74 65 73 74 20 4f This is a test O
0640: 46 20 54 48 45 20 6d 65 72 67 69 6e 67 20 61 6c F THE merging al
0650: 67 6f 68 6d 20 2d 20 33 33 33 33 0a 20 20 34 34 gohm - 3333. 44
0660: 34 20 2d 20 49 66 20 61 6c 6c 20 67 6f 65 73 20 4 - If all goes
0670: 77 65 6c 6c 2c 20 77 65 20 77 69 6c 6c 20 62 65 well, we will be
0680: 20 70 6c 65 61 73 65 64 20 2d 20 34 34 34 34 0a pleased - 4444.
0690: 20 20 35 35 35 20 2d 20 77 65 20 74 68 69 6e 6b 555 - we think
06a0: 20 69 74 20 77 65 6c 6c 20 61 6e 64 20 6f 74 68 it well and oth
06b0: 65 72 20 73 74 75 66 66 20 74 6f 6f 20 2d 20 35 er stuff too - 5
06c0: 35 35 35 0a 7d 0a 77 72 69 74 65 5f 66 69 6c 65 555.}.write_file
06d0: 5f 69 6e 64 65 6e 74 65 64 20 74 32 33 20 7b 0a _indented t23 {.
06e0: 20 20 31 31 31 20 2d 20 54 68 69 73 20 69 73 20 111 - This is
06f0: 6c 69 6e 65 20 4f 4e 45 20 6f 66 20 74 68 65 20 line ONE of the
0700: 64 65 6d 6f 20 70 72 6f 67 72 61 6d 20 2d 20 31 demo program - 1
0710: 31 31 31 0a 20 20 32 32 32 20 2d 20 54 68 65 20 111. 222 - The
0720: 73 65 63 6f 6e 64 20 6c 69 6e 65 20 70 72 6f 67 second line prog
0730: 72 61 6d 20 6c 69 6e 65 20 69 6e 20 63 6f 64 65 ram line in code
0740: 20 2d 20 32 32 32 32 0a 20 20 33 33 33 20 2d 20 - 2222. 333 -
0750: 54 68 69 73 20 69 73 20 61 20 74 65 73 74 20 4f This is a test O
0760: 46 20 54 48 45 20 6d 65 72 67 69 6e 67 20 61 6c F THE merging al
0770: 67 6f 68 6d 20 2d 20 33 33 33 33 0a 20 20 34 34 gohm - 3333. 44
0780: 34 20 2d 20 49 66 20 61 6c 6c 20 67 6f 65 73 20 4 - If all goes
0790: 77 65 6c 6c 2c 20 77 65 20 77 69 6c 6c 20 62 65 well, we will be
07a0: 20 70 6c 65 61 73 65 64 20 2d 20 34 34 34 34 0a pleased - 4444.
07b0: 20 20 35 35 35 20 2d 20 77 65 20 74 68 69 6e 6b 555 - we think
07c0: 20 69 74 20 77 65 6c 6c 20 61 6e 64 20 6f 74 68 it well and oth
07d0: 65 72 20 73 74 75 66 66 20 74 6f 6f 20 2d 20 35 er stuff too - 5
07e0: 35 35 35 0a 7d 0a 66 6f 73 73 69 6c 20 74 65 73 555.}.fossil tes
07f0: 74 2d 33 20 74 31 20 74 33 20 74 32 20 61 33 32 t-3 t1 t3 t2 a32
0800: 0a 74 65 73 74 20 6d 65 72 67 65 31 2d 31 2e 31 .test merge1-1.1
0810: 20 7b 5b 73 61 6d 65 5f 66 69 6c 65 20 74 32 33 {[same_file t23
0820: 20 61 33 32 5d 7d 0a 66 6f 73 73 69 6c 20 74 65 a32]}.fossil te
0830: 73 74 2d 33 20 74 31 20 74 32 20 74 33 20 61 32 st-3 t1 t2 t3 a2
0840: 33 0a 74 65 73 74 20 6d 65 72 67 65 31 2d 31 2e 3.test merge1-1.
0850: 32 20 7b 5b 73 61 6d 65 5f 66 69 6c 65 20 74 32 2 {[same_file t2
0860: 33 20 61 32 33 5d 7d 0a 0a 77 72 69 74 65 5f 66 3 a23]}..write_f
0870: 69 6c 65 5f 69 6e 64 65 6e 74 65 64 20 74 31 20 ile_indented t1
0880: 7b 0a 20 20 31 31 31 20 2d 20 54 68 69 73 20 69 {. 111 - This i
0890: 73 20 6c 69 6e 65 20 6f 6e 65 20 6f 66 20 74 68 s line one of th
08a0: 65 20 64 65 6d 6f 20 70 72 6f 67 72 61 6d 20 2d e demo program -
08b0: 20 31 31 31 31 0a 20 20 32 32 32 20 2d 20 54 68 1111. 222 - Th
08c0: 65 20 73 65 63 6f 6e 64 20 6c 69 6e 65 20 70 72 e second line pr
08d0: 6f 67 72 61 6d 20 6c 69 6e 65 20 69 6e 20 63 6f ogram line in co
08e0: 64 65 20 2d 20 32 32 32 32 0a 20 20 33 33 33 20 de - 2222. 333
08f0: 2d 20 54 68 69 73 20 69 73 20 61 20 74 65 73 74 - This is a test
0900: 20 6f 66 20 74 68 65 20 6d 65 72 67 69 6e 67 20 of the merging
0910: 61 6c 67 6f 68 6d 20 2d 20 33 33 33 33 0a 20 20 algohm - 3333.
0920: 34 34 34 20 2d 20 49 66 20 61 6c 6c 20 67 6f 65 444 - If all goe
0930: 73 20 77 65 6c 6c 2c 20 77 65 20 77 69 6c 6c 20 s well, we will
0940: 62 65 20 70 6c 65 61 73 65 64 20 2d 20 34 34 34 be pleased - 444
0950: 34 0a 20 20 35 35 35 20 2d 20 77 65 20 74 68 69 4. 555 - we thi
0960: 6e 6b 20 69 74 20 77 65 6c 6c 20 61 6e 64 20 6f nk it well and o
0970: 74 68 65 72 20 73 74 75 66 66 20 74 6f 6f 20 2d ther stuff too -
0980: 20 35 35 35 35 0a 7d 0a 77 72 69 74 65 5f 66 69 5555.}.write_fi
0990: 6c 65 5f 69 6e 64 65 6e 74 65 64 20 74 32 20 7b le_indented t2 {
09a0: 0a 20 20 31 31 31 20 2d 20 54 68 69 73 20 69 73 . 111 - This is
09b0: 20 6c 69 6e 65 20 4f 4e 45 20 6f 66 20 74 68 65 line ONE of the
09c0: 20 64 65 6d 6f 20 70 72 6f 67 72 61 6d 20 2d 20 demo program -
09d0: 31 31 31 31 0a 20 20 32 32 32 20 2d 20 54 68 65 1111. 222 - The
09e0: 20 73 65 63 6f 6e 64 20 6c 69 6e 65 20 70 72 6f second line pro
09f0: 67 72 61 6d 20 6c 69 6e 65 20 69 6e 20 63 6f 64 gram line in cod
0a00: 65 20 2d 20 32 32 32 32 0a 20 20 33 33 33 20 2d e - 2222. 333 -
0a10: 20 54 68 69 73 20 69 73 20 61 20 74 65 73 74 20 This is a test
0a20: 6f 66 20 74 68 65 20 6d 65 72 67 69 6e 67 20 61 of the merging a
0a30: 6c 67 6f 68 6d 20 2d 20 33 33 33 33 0a 20 20 34 lgohm - 3333. 4
0a40: 34 34 20 2d 20 49 66 20 61 6c 6c 20 67 6f 65 73 44 - If all goes
0a50: 20 77 65 6c 6c 2c 20 77 65 20 77 69 6c 6c 20 62 well, we will b
0a60: 65 20 70 6c 65 61 73 65 64 20 2d 20 34 34 34 34 e pleased - 4444
0a70: 0a 20 20 35 35 35 20 2d 20 77 65 20 74 68 69 6e . 555 - we thin
0a80: 6b 20 69 74 20 77 65 6c 6c 20 61 6e 64 20 6f 74 k it well and ot
0a90: 68 65 72 20 73 74 75 66 66 20 74 6f 6f 20 2d 20 her stuff too -
0aa0: 35 35 35 35 0a 7d 0a 77 72 69 74 65 5f 66 69 6c 5555.}.write_fil
0ab0: 65 5f 69 6e 64 65 6e 74 65 64 20 74 33 20 7b 0a e_indented t3 {.
0ac0: 20 20 31 31 31 20 2d 20 54 68 69 73 20 69 73 20 111 - This is
0ad0: 6c 69 6e 65 20 6f 6e 65 20 4f 46 20 74 68 65 20 line one OF the
0ae0: 64 65 6d 6f 20 70 72 6f 67 72 61 6d 20 2d 20 31 demo program - 1
0af0: 31 31 31 0a 20 20 32 32 32 20 2d 20 54 68 65 20 111. 222 - The
0b00: 73 65 63 6f 6e 64 20 6c 69 6e 65 20 70 72 6f 67 second line prog
0b10: 72 61 6d 20 6c 69 6e 65 20 69 6e 20 63 6f 64 65 ram line in code
0b20: 20 2d 20 32 32 32 32 0a 20 20 33 33 33 20 2d 20 - 2222. 333 -
0b30: 54 68 69 73 20 69 73 20 61 20 74 65 73 74 20 6f This is a test o
0b40: 66 20 74 68 65 20 6d 65 72 67 69 6e 67 20 61 6c f the merging al
0b50: 67 6f 68 6d 20 2d 20 33 33 33 33 0a 20 20 34 34 gohm - 3333. 44
0b60: 34 20 2d 20 49 66 20 61 6c 6c 20 67 6f 65 73 20 4 - If all goes
0b70: 77 65 6c 6c 2c 20 77 65 20 77 69 6c 6c 20 62 65 well, we will be
0b80: 20 70 6c 65 61 73 65 64 20 2d 20 34 34 34 34 0a pleased - 4444.
0b90: 20 20 35 35 35 20 2d 20 77 65 20 74 68 69 6e 6b 555 - we think
0ba0: 20 69 74 20 77 65 6c 6c 20 61 6e 64 20 6f 74 68 it well and oth
0bb0: 65 72 20 73 74 75 66 66 20 74 6f 6f 20 2d 20 35 er stuff too - 5
0bc0: 35 35 35 0a 7d 0a 77 72 69 74 65 5f 66 69 6c 65 555.}.write_file
0bd0: 5f 69 6e 64 65 6e 74 65 64 20 74 32 33 20 7b 0a _indented t23 {.
0be0: 20 20 3e 3e 3e 3e 3e 3e 3e 20 42 45 47 49 4e 20 >>>>>>> BEGIN
0bf0: 4d 45 52 47 45 20 43 4f 4e 46 4c 49 43 54 0a 20 MERGE CONFLICT.
0c00: 20 31 31 31 20 2d 20 54 68 69 73 20 69 73 20 6c 111 - This is l
0c10: 69 6e 65 20 4f 4e 45 20 6f 66 20 74 68 65 20 64 ine ONE of the d
0c20: 65 6d 6f 20 70 72 6f 67 72 61 6d 20 2d 20 31 31 emo program - 11
0c30: 31 31 0a 20 20 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 11. ===========
0c40: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0c50: 3d 0a 20 20 31 31 31 20 2d 20 54 68 69 73 20 69 =. 111 - This i
0c60: 73 20 6c 69 6e 65 20 6f 6e 65 20 4f 46 20 74 68 s line one OF th
0c70: 65 20 64 65 6d 6f 20 70 72 6f 67 72 61 6d 20 2d e demo program -
0c80: 20 31 31 31 31 0a 20 20 3c 3c 3c 3c 3c 3c 3c 20 1111. <<<<<<<
0c90: 45 4e 44 20 4d 45 52 47 45 20 43 4f 4e 46 4c 49 END MERGE CONFLI
0ca0: 43 54 0a 20 20 32 32 32 20 2d 20 54 68 65 20 73 CT. 222 - The s
0cb0: 65 63 6f 6e 64 20 6c 69 6e 65 20 70 72 6f 67 72 econd line progr
0cc0: 61 6d 20 6c 69 6e 65 20 69 6e 20 63 6f 64 65 20 am line in code
0cd0: 2d 20 32 32 32 32 0a 20 20 33 33 33 20 2d 20 54 - 2222. 333 - T
0ce0: 68 69 73 20 69 73 20 61 20 74 65 73 74 20 6f 66 his is a test of
0cf0: 20 74 68 65 20 6d 65 72 67 69 6e 67 20 61 6c 67 the merging alg
0d00: 6f 68 6d 20 2d 20 33 33 33 33 0a 20 20 34 34 34 ohm - 3333. 444
0d10: 20 2d 20 49 66 20 61 6c 6c 20 67 6f 65 73 20 77 - If all goes w
0d20: 65 6c 6c 2c 20 77 65 20 77 69 6c 6c 20 62 65 20 ell, we will be
0d30: 70 6c 65 61 73 65 64 20 2d 20 34 34 34 34 0a 20 pleased - 4444.
0d40: 20 35 35 35 20 2d 20 77 65 20 74 68 69 6e 6b 20 555 - we think
0d50: 69 74 20 77 65 6c 6c 20 61 6e 64 20 6f 74 68 65 it well and othe
0d60: 72 20 73 74 75 66 66 20 74 6f 6f 20 2d 20 35 35 r stuff too - 55
0d70: 35 35 0a 7d 0a 77 72 69 74 65 5f 66 69 6c 65 5f 55.}.write_file_
0d80: 69 6e 64 65 6e 74 65 64 20 74 33 32 20 7b 0a 20 indented t32 {.
0d90: 20 3e 3e 3e 3e 3e 3e 3e 20 42 45 47 49 4e 20 4d >>>>>>> BEGIN M
0da0: 45 52 47 45 20 43 4f 4e 46 4c 49 43 54 0a 20 20 ERGE CONFLICT.
0db0: 31 31 31 20 2d 20 54 68 69 73 20 69 73 20 6c 69 111 - This is li
0dc0: 6e 65 20 6f 6e 65 20 4f 46 20 74 68 65 20 64 65 ne one OF the de
0dd0: 6d 6f 20 70 72 6f 67 72 61 6d 20 2d 20 31 31 31 mo program - 111
0de0: 31 0a 20 20 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 1. ============
0df0: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0e00: 0a 20 20 31 31 31 20 2d 20 54 68 69 73 20 69 73 . 111 - This is
0e10: 20 6c 69 6e 65 20 4f 4e 45 20 6f 66 20 74 68 65 line ONE of the
0e20: 20 64 65 6d 6f 20 70 72 6f 67 72 61 6d 20 2d 20 demo program -
0e30: 31 31 31 31 0a 20 20 3c 3c 3c 3c 3c 3c 3c 20 45 1111. <<<<<<< E
0e40: 4e 44 20 4d 45 52 47 45 20 43 4f 4e 46 4c 49 43 ND MERGE CONFLIC
0e50: 54 0a 20 20 32 32 32 20 2d 20 54 68 65 20 73 65 T. 222 - The se
0e60: 63 6f 6e 64 20 6c 69 6e 65 20 70 72 6f 67 72 61 cond line progra
0e70: 6d 20 6c 69 6e 65 20 69 6e 20 63 6f 64 65 20 2d m line in code -
0e80: 20 32 32 32 32 0a 20 20 33 33 33 20 2d 20 54 68 2222. 333 - Th
0e90: 69 73 20 69 73 20 61 20 74 65 73 74 20 6f 66 20 is is a test of
0ea0: 74 68 65 20 6d 65 72 67 69 6e 67 20 61 6c 67 6f the merging algo
0eb0: 68 6d 20 2d 20 33 33 33 33 0a 20 20 34 34 34 20 hm - 3333. 444
0ec0: 2d 20 49 66 20 61 6c 6c 20 67 6f 65 73 20 77 65 - If all goes we
0ed0: 6c 6c 2c 20 77 65 20 77 69 6c 6c 20 62 65 20 70 ll, we will be p
0ee0: 6c 65 61 73 65 64 20 2d 20 34 34 34 34 0a 20 20 leased - 4444.
0ef0: 35 35 35 20 2d 20 77 65 20 74 68 69 6e 6b 20 69 555 - we think i
0f00: 74 20 77 65 6c 6c 20 61 6e 64 20 6f 74 68 65 72 t well and other
0f10: 20 73 74 75 66 66 20 74 6f 6f 20 2d 20 35 35 35 stuff too - 555
0f20: 35 0a 7d 0a 66 6f 73 73 69 6c 20 74 65 73 74 2d 5.}.fossil test-
0f30: 33 20 74 31 20 74 33 20 74 32 20 61 33 32 0a 74 3 t1 t3 t2 a32.t
0f40: 65 73 74 20 6d 65 72 67 65 31 2d 32 2e 31 20 7b est merge1-2.1 {
0f50: 5b 73 61 6d 65 5f 66 69 6c 65 20 74 33 32 20 61 [same_file t32 a
0f60: 33 32 5d 7d 0a 66 6f 73 73 69 6c 20 74 65 73 74 32]}.fossil test
0f70: 2d 33 20 74 31 20 74 32 20 74 33 20 61 32 33 0a -3 t1 t2 t3 a23.
0f80: 74 65 73 74 20 6d 65 72 67 65 31 2d 32 2e 32 20 test merge1-2.2
0f90: 7b 5b 73 61 6d 65 5f 66 69 6c 65 20 74 32 33 20 {[same_file t23
0fa0: 61 32 33 5d 7d 0a 0a 77 72 69 74 65 5f 66 69 6c a23]}..write_fil
0fb0: 65 5f 69 6e 64 65 6e 74 65 64 20 74 31 20 7b 0a e_indented t1 {.
0fc0: 20 20 31 31 31 20 2d 20 54 68 69 73 20 69 73 20 111 - This is
0fd0: 6c 69 6e 65 20 6f 6e 65 20 6f 66 20 74 68 65 20 line one of the
0fe0: 64 65 6d 6f 20 70 72 6f 67 72 61 6d 20 2d 20 31 demo program - 1
0ff0: 31 31 31 0a 20 20 32 32 32 20 2d 20 54 68 65 20 111. 222 - The
1000: 73 65 63 6f 6e 64 20 6c 69 6e 65 20 70 72 6f 67 second line prog
1010: 72 61 6d 20 6c 69 6e 65 20 69 6e 20 63 6f 64 65 ram line in code
1020: 20 2d 20 32 32 32 32 0a 20 20 33 33 33 20 2d 20 - 2222. 333 -
1030: 54 68 69 73 20 69 73 20 61 20 74 65 73 74 20 6f This is a test o
1040: 66 20 74 68 65 20 6d 65 72 67 69 6e 67 20 61 6c f the merging al
1050: 67 6f 68 6d 20 2d 20 33 33 33 33 0a 20 20 34 34 gohm - 3333. 44
1060: 34 20 2d 20 49 66 20 61 6c 6c 20 67 6f 65 73 20 4 - If all goes
1070: 77 65 6c 6c 2c 20 77 65 20 77 69 6c 6c 20 62 65 well, we will be
1080: 20 70 6c 65 61 73 65 64 20 2d 20 34 34 34 34 0a pleased - 4444.
1090: 20 20 35 35 35 20 2d 20 77 65 20 74 68 69 6e 6b 555 - we think
10a0: 20 69 74 20 77 65 6c 6c 20 61 6e 64 20 6f 74 68 it well and oth
10b0: 65 72 20 73 74 75 66 66 20 74 6f 6f 20 2d 20 35 er stuff too - 5
10c0: 35 35 35 0a 7d 0a 77 72 69 74 65 5f 66 69 6c 65 555.}.write_file
10d0: 5f 69 6e 64 65 6e 74 65 64 20 74 32 20 7b 0a 20 _indented t2 {.
10e0: 20 31 31 31 20 2d 20 54 68 69 73 20 69 73 20 6c 111 - This is l
10f0: 69 6e 65 20 4f 4e 45 20 6f 66 20 74 68 65 20 64 ine ONE of the d
1100: 65 6d 6f 20 70 72 6f 67 72 61 6d 20 2d 20 31 31 emo program - 11
1110: 31 31 0a 20 20 32 32 32 20 2d 20 54 68 65 20 73 11. 222 - The s
1120: 65 63 6f 6e 64 20 6c 69 6e 65 20 70 72 6f 67 72 econd line progr
1130: 61 6d 20 6c 69 6e 65 20 69 6e 20 63 6f 64 65 20 am line in code
1140: 2d 20 32 32 32 32 0a 20 20 33 33 33 20 2d 20 54 - 2222. 333 - T
1150: 68 69 73 20 69 73 20 61 20 74 65 73 74 20 6f 66 his is a test of
1160: 20 74 68 65 20 6d 65 72 67 69 6e 67 20 61 6c 67 the merging alg
1170: 6f 68 6d 20 2d 20 33 33 33 33 0a 20 20 34 34 34 ohm - 3333. 444
1180: 20 2d 20 49 66 20 61 6c 6c 20 67 6f 65 73 20 77 - If all goes w
1190: 65 6c 6c 2c 20 77 65 20 77 69 6c 6c 20 62 65 20 ell, we will be
11a0: 70 6c 65 61 73 65 64 20 2d 20 34 34 34 34 0a 20 pleased - 4444.
11b0: 20 35 35 35 20 2d 20 77 65 20 74 68 69 6e 6b 20 555 - we think
11c0: 69 74 20 77 65 6c 6c 20 61 6e 64 20 6f 74 68 65 it well and othe
11d0: 72 20 73 74 75 66 66 20 74 6f 6f 20 2d 20 35 35 r stuff too - 55
11e0: 35 35 0a 7d 0a 77 72 69 74 65 5f 66 69 6c 65 5f 55.}.write_file_
11f0: 69 6e 64 65 6e 74 65 64 20 74 33 20 7b 0a 20 20 indented t3 {.
1200: 31 31 31 20 2d 20 54 68 69 73 20 69 73 20 6c 69 111 - This is li
1210: 6e 65 20 4f 4e 45 20 6f 66 20 74 68 65 20 64 65 ne ONE of the de
1220: 6d 6f 20 70 72 6f 67 72 61 6d 20 2d 20 31 31 31 mo program - 111
1230: 31 0a 20 20 32 32 32 20 2d 20 54 68 65 20 73 65 1. 222 - The se
1240: 63 6f 6e 64 20 6c 69 6e 65 20 70 72 6f 67 72 61 cond line progra
1250: 6d 20 6c 69 6e 65 20 69 6e 20 63 6f 64 65 20 2d m line in code -
1260: 20 32 32 32 32 0a 20 20 33 33 33 20 2d 20 54 68 2222. 333 - Th
1270: 69 73 20 69 73 20 61 20 74 65 73 74 20 6f 66 20 is is a test of
1280: 74 68 65 20 6d 65 72 67 69 6e 67 20 61 6c 67 6f the merging algo
1290: 68 6d 20 2d 20 33 33 33 33 0a 20 20 34 34 34 20 hm - 3333. 444
12a0: 2d 20 49 66 20 61 6c 6c 20 67 6f 65 73 20 77 65 - If all goes we
12b0: 6c 6c 2c 20 77 65 20 77 69 6c 6c 20 62 65 20 70 ll, we will be p
12c0: 6c 65 61 73 65 64 20 2d 20 34 34 34 34 0a 20 20 leased - 4444.
12d0: 35 35 35 20 2d 20 77 65 20 74 68 69 6e 6b 20 69 555 - we think i
12e0: 74 20 77 65 6c 6c 20 61 6e 64 20 6f 74 68 65 72 t well and other
12f0: 20 73 74 75 66 66 20 74 6f 6f 20 2d 20 35 35 35 stuff too - 555
1300: 35 0a 7d 0a 77 72 69 74 65 5f 66 69 6c 65 5f 69 5.}.write_file_i
1310: 6e 64 65 6e 74 65 64 20 74 32 33 20 7b 0a 20 20 ndented t23 {.
1320: 31 31 31 20 2d 20 54 68 69 73 20 69 73 20 6c 69 111 - This is li
1330: 6e 65 20 4f 4e 45 20 6f 66 20 74 68 65 20 64 65 ne ONE of the de
1340: 6d 6f 20 70 72 6f 67 72 61 6d 20 2d 20 31 31 31 mo program - 111
1350: 31 0a 20 20 32 32 32 20 2d 20 54 68 65 20 73 65 1. 222 - The se
1360: 63 6f 6e 64 20 6c 69 6e 65 20 70 72 6f 67 72 61 cond line progra
1370: 6d 20 6c 69 6e 65 20 69 6e 20 63 6f 64 65 20 2d m line in code -
1380: 20 32 32 32 32 0a 20 20 33 33 33 20 2d 20 54 68 2222. 333 - Th
1390: 69 73 20 69 73 20 61 20 74 65 73 74 20 6f 66 20 is is a test of
13a0: 74 68 65 20 6d 65 72 67 69 6e 67 20 61 6c 67 6f the merging algo
13b0: 68 6d 20 2d 20 33 33 33 33 0a 20 20 34 34 34 20 hm - 3333. 444
13c0: 2d 20 49 66 20 61 6c 6c 20 67 6f 65 73 20 77 65 - If all goes we
13d0: 6c 6c 2c 20 77 65 20 77 69 6c 6c 20 62 65 20 70 ll, we will be p
13e0: 6c 65 61 73 65 64 20 2d 20 34 34 34 34 0a 20 20 leased - 4444.
13f0: 35 35 35 20 2d 20 77 65 20 74 68 69 6e 6b 20 69 555 - we think i
1400: 74 20 77 65 6c 6c 20 61 6e 64 20 6f 74 68 65 72 t well and other
1410: 20 73 74 75 66 66 20 74 6f 6f 20 2d 20 35 35 35 stuff too - 555
1420: 35 0a 7d 0a 66 6f 73 73 69 6c 20 74 65 73 74 2d 5.}.fossil test-
1430: 33 20 74 31 20 74 33 20 74 32 20 61 33 32 0a 74 3 t1 t3 t2 a32.t
1440: 65 73 74 20 6d 65 72 67 65 31 2d 33 2e 31 20 7b est merge1-3.1 {
1450: 5b 73 61 6d 65 5f 66 69 6c 65 20 74 32 33 20 61 [same_file t23 a
1460: 33 32 5d 7d 0a 66 6f 73 73 69 6c 20 74 65 73 74 32]}.fossil test
1470: 2d 33 20 74 31 20 74 32 20 74 33 20 61 32 33 0a -3 t1 t2 t3 a23.
1480: 74 65 73 74 20 6d 65 72 67 65 31 2d 33 2e 32 20 test merge1-3.2
1490: 7b 5b 73 61 6d 65 5f 66 69 6c 65 20 74 32 33 20 {[same_file t23
14a0: 61 32 33 5d 7d 0a 0a 77 72 69 74 65 5f 66 69 6c a23]}..write_fil
14b0: 65 5f 69 6e 64 65 6e 74 65 64 20 74 31 20 7b 0a e_indented t1 {.
14c0: 20 20 31 31 31 20 2d 20 54 68 69 73 20 69 73 20 111 - This is
14d0: 6c 69 6e 65 20 6f 6e 65 20 6f 66 20 74 68 65 20 line one of the
14e0: 64 65 6d 6f 20 70 72 6f 67 72 61 6d 20 2d 20 31 demo program - 1
14f0: 31 31 31 0a 20 20 32 32 32 20 2d 20 54 68 65 20 111. 222 - The
1500: 73 65 63 6f 6e 64 20 6c 69 6e 65 20 70 72 6f 67 second line prog
1510: 72 61 6d 20 6c 69 6e 65 20 69 6e 20 63 6f 64 65 ram line in code
1520: 20 2d 20 32 32 32 32 0a 20 20 33 33 33 20 2d 20 - 2222. 333 -
1530: 54 68 69 73 20 69 73 20 61 20 74 65 73 74 20 6f This is a test o
1540: 66 20 74 68 65 20 6d 65 72 67 69 6e 67 20 61 6c f the merging al
1550: 67 6f 68 6d 20 2d 20 33 33 33 33 0a 20 20 34 34 gohm - 3333. 44
1560: 34 20 2d 20 49 66 20 61 6c 6c 20 67 6f 65 73 20 4 - If all goes
1570: 77 65 6c 6c 2c 20 77 65 20 77 69 6c 6c 20 62 65 well, we will be
1580: 20 70 6c 65 61 73 65 64 20 2d 20 34 34 34 34 0a pleased - 4444.
1590: 20 20 35 35 35 20 2d 20 77 65 20 74 68 69 6e 6b 555 - we think
15a0: 20 69 74 20 77 65 6c 6c 20 61 6e 64 20 6f 74 68 it well and oth
15b0: 65 72 20 73 74 75 66 66 20 74 6f 6f 20 2d 20 35 er stuff too - 5
15c0: 35 35 35 0a 7d 0a 77 72 69 74 65 5f 66 69 6c 65 555.}.write_file
15d0: 5f 69 6e 64 65 6e 74 65 64 20 74 32 20 7b 0a 20 _indented t2 {.
15e0: 20 30 30 30 20 2d 20 5a 65 72 6f 20 6c 69 6e 65 000 - Zero line
15f0: 73 20 61 64 64 65 64 20 74 6f 20 74 68 65 20 62 s added to the b
1600: 65 67 69 6e 6e 69 6e 67 20 6f 66 20 2d 20 30 30 eginning of - 00
1610: 30 30 0a 20 20 31 31 31 20 2d 20 54 68 69 73 20 00. 111 - This
1620: 69 73 20 6c 69 6e 65 20 6f 6e 65 20 6f 66 20 74 is line one of t
1630: 68 65 20 64 65 6d 6f 20 70 72 6f 67 72 61 6d 20 he demo program
1640: 2d 20 31 31 31 31 0a 20 20 32 32 32 20 2d 20 54 - 1111. 222 - T
1650: 68 65 20 73 65 63 6f 6e 64 20 6c 69 6e 65 20 70 he second line p
1660: 72 6f 67 72 61 6d 20 6c 69 6e 65 20 69 6e 20 63 rogram line in c
1670: 6f 64 65 20 2d 20 32 32 32 32 0a 20 20 33 33 33 ode - 2222. 333
1680: 20 2d 20 54 68 69 73 20 69 73 20 61 20 74 65 73 - This is a tes
1690: 74 20 6f 66 20 74 68 65 20 6d 65 72 67 69 6e 67 t of the merging
16a0: 20 61 6c 67 6f 68 6d 20 2d 20 33 33 33 33 0a 20 algohm - 3333.
16b0: 20 34 34 34 20 2d 20 49 66 20 61 6c 6c 20 67 6f 444 - If all go
16c0: 65 73 20 77 65 6c 6c 2c 20 77 65 20 77 69 6c 6c es well, we will
16d0: 20 62 65 20 70 6c 65 61 73 65 64 20 2d 20 34 34 be pleased - 44
16e0: 34 34 0a 20 20 35 35 35 20 2d 20 77 65 20 74 68 44. 555 - we th
16f0: 69 6e 6b 20 69 74 20 77 65 6c 6c 20 61 6e 64 20 ink it well and
1700: 6f 74 68 65 72 20 73 74 75 66 66 20 74 6f 6f 20 other stuff too
1710: 2d 20 35 35 35 35 0a 7d 0a 77 72 69 74 65 5f 66 - 5555.}.write_f
1720: 69 6c 65 5f 69 6e 64 65 6e 74 65 64 20 74 33 20 ile_indented t3
1730: 7b 0a 20 20 32 32 32 20 2d 20 54 68 65 20 73 65 {. 222 - The se
1740: 63 6f 6e 64 20 6c 69 6e 65 20 70 72 6f 67 72 61 cond line progra
1750: 6d 20 6c 69 6e 65 20 69 6e 20 63 6f 64 65 20 2d m line in code -
1760: 20 32 32 32 32 0a 20 20 33 33 33 20 2d 20 54 68 2222. 333 - Th
1770: 69 73 20 69 73 20 61 20 74 65 73 74 20 6f 66 20 is is a test of
1780: 74 68 65 20 6d 65 72 67 69 6e 67 20 61 6c 67 6f the merging algo
1790: 68 6d 20 2d 20 33 33 33 33 0a 20 20 34 34 34 20 hm - 3333. 444
17a0: 2d 20 49 66 20 61 6c 6c 20 67 6f 65 73 20 77 65 - If all goes we
17b0: 6c 6c 2c 20 77 65 20 77 69 6c 6c 20 62 65 20 70 ll, we will be p
17c0: 6c 65 61 73 65 64 20 2d 20 34 34 34 34 0a 20 20 leased - 4444.
17d0: 35 35 35 20 2d 20 77 65 20 74 68 69 6e 6b 20 69 555 - we think i
17e0: 74 20 77 65 6c 6c 20 61 6e 64 20 6f 74 68 65 72 t well and other
17f0: 20 73 74 75 66 66 20 74 6f 6f 20 2d 20 35 35 35 stuff too - 555
1800: 35 0a 7d 0a 77 72 69 74 65 5f 66 69 6c 65 5f 69 5.}.write_file_i
1810: 6e 64 65 6e 74 65 64 20 74 33 32 20 7b 0a 20 20 ndented t32 {.
1820: 3e 3e 3e 3e 3e 3e 3e 20 42 45 47 49 4e 20 4d 45 >>>>>>> BEGIN ME
1830: 52 47 45 20 43 4f 4e 46 4c 49 43 54 0a 20 20 3d RGE CONFLICT. =
1840: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
1850: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 0a 20 20 30 30 ===========. 00
1860: 30 20 2d 20 5a 65 72 6f 20 6c 69 6e 65 73 20 61 0 - Zero lines a
1870: 64 64 65 64 20 74 6f 20 74 68 65 20 62 65 67 69 dded to the begi
1880: 6e 6e 69 6e 67 20 6f 66 20 2d 20 30 30 30 30 0a nning of - 0000.
1890: 20 20 31 31 31 20 2d 20 54 68 69 73 20 69 73 20 111 - This is
18a0: 6c 69 6e 65 20 6f 6e 65 20 6f 66 20 74 68 65 20 line one of the
18b0: 64 65 6d 6f 20 70 72 6f 67 72 61 6d 20 2d 20 31 demo program - 1
18c0: 31 31 31 0a 20 20 3c 3c 3c 3c 3c 3c 3c 20 45 4e 111. <<<<<<< EN
18d0: 44 20 4d 45 52 47 45 20 43 4f 4e 46 4c 49 43 54 D MERGE CONFLICT
18e0: 0a 20 20 32 32 32 20 2d 20 54 68 65 20 73 65 63 . 222 - The sec
18f0: 6f 6e 64 20 6c 69 6e 65 20 70 72 6f 67 72 61 6d ond line program
1900: 20 6c 69 6e 65 20 69 6e 20 63 6f 64 65 20 2d 20 line in code -
1910: 32 32 32 32 0a 20 20 33 33 33 20 2d 20 54 68 69 2222. 333 - Thi
1920: 73 20 69 73 20 61 20 74 65 73 74 20 6f 66 20 74 s is a test of t
1930: 68 65 20 6d 65 72 67 69 6e 67 20 61 6c 67 6f 68 he merging algoh
1940: 6d 20 2d 20 33 33 33 33 0a 20 20 34 34 34 20 2d m - 3333. 444 -
1950: 20 49 66 20 61 6c 6c 20 67 6f 65 73 20 77 65 6c If all goes wel
1960: 6c 2c 20 77 65 20 77 69 6c 6c 20 62 65 20 70 6c l, we will be pl
1970: 65 61 73 65 64 20 2d 20 34 34 34 34 0a 20 20 35 eased - 4444. 5
1980: 35 35 20 2d 20 77 65 20 74 68 69 6e 6b 20 69 74 55 - we think it
1990: 20 77 65 6c 6c 20 61 6e 64 20 6f 74 68 65 72 20 well and other
19a0: 73 74 75 66 66 20 74 6f 6f 20 2d 20 35 35 35 35 stuff too - 5555
19b0: 0a 7d 0a 77 72 69 74 65 5f 66 69 6c 65 5f 69 6e .}.write_file_in
19c0: 64 65 6e 74 65 64 20 74 32 33 20 7b 0a 20 20 3e dented t23 {. >
19d0: 3e 3e 3e 3e 3e 3e 20 42 45 47 49 4e 20 4d 45 52 >>>>>> BEGIN MER
19e0: 47 45 20 43 4f 4e 46 4c 49 43 54 0a 20 20 30 30 GE CONFLICT. 00
19f0: 30 20 2d 20 5a 65 72 6f 20 6c 69 6e 65 73 20 61 0 - Zero lines a
1a00: 64 64 65 64 20 74 6f 20 74 68 65 20 62 65 67 69 dded to the begi
1a10: 6e 6e 69 6e 67 20 6f 66 20 2d 20 30 30 30 30 0a nning of - 0000.
1a20: 20 20 31 31 31 20 2d 20 54 68 69 73 20 69 73 20 111 - This is
1a30: 6c 69 6e 65 20 6f 6e 65 20 6f 66 20 74 68 65 20 line one of the
1a40: 64 65 6d 6f 20 70 72 6f 67 72 61 6d 20 2d 20 31 demo program - 1
1a50: 31 31 31 0a 20 20 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 111. ==========
1a60: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
1a70: 3d 3d 0a 20 20 3c 3c 3c 3c 3c 3c 3c 20 45 4e 44 ==. <<<<<<< END
1a80: 20 4d 45 52 47 45 20 43 4f 4e 46 4c 49 43 54 0a MERGE CONFLICT.
1a90: 20 20 32 32 32 20 2d 20 54 68 65 20 73 65 63 6f 222 - The seco
1aa0: 6e 64 20 6c 69 6e 65 20 70 72 6f 67 72 61 6d 20 nd line program
1ab0: 6c 69 6e 65 20 69 6e 20 63 6f 64 65 20 2d 20 32 line in code - 2
1ac0: 32 32 32 0a 20 20 33 33 33 20 2d 20 54 68 69 73 222. 333 - This
1ad0: 20 69 73 20 61 20 74 65 73 74 20 6f 66 20 74 68 is a test of th
1ae0: 65 20 6d 65 72 67 69 6e 67 20 61 6c 67 6f 68 6d e merging algohm
1af0: 20 2d 20 33 33 33 33 0a 20 20 34 34 34 20 2d 20 - 3333. 444 -
1b00: 49 66 20 61 6c 6c 20 67 6f 65 73 20 77 65 6c 6c If all goes well
1b10: 2c 20 77 65 20 77 69 6c 6c 20 62 65 20 70 6c 65 , we will be ple
1b20: 61 73 65 64 20 2d 20 34 34 34 34 0a 20 20 35 35 ased - 4444. 55
1b30: 35 20 2d 20 77 65 20 74 68 69 6e 6b 20 69 74 20 5 - we think it
1b40: 77 65 6c 6c 20 61 6e 64 20 6f 74 68 65 72 20 73 well and other s
1b50: 74 75 66 66 20 74 6f 6f 20 2d 20 35 35 35 35 0a tuff too - 5555.
1b60: 7d 0a 66 6f 73 73 69 6c 20 74 65 73 74 2d 33 20 }.fossil test-3
1b70: 74 31 20 74 33 20 74 32 20 61 33 32 0a 74 65 73 t1 t3 t2 a32.tes
1b80: 74 20 6d 65 72 67 65 31 2d 34 2e 31 20 7b 5b 73 t merge1-4.1 {[s
1b90: 61 6d 65 5f 66 69 6c 65 20 74 33 32 20 61 33 32 ame_file t32 a32
1ba0: 5d 7d 0a 66 6f 73 73 69 6c 20 74 65 73 74 2d 33 ]}.fossil test-3
1bb0: 20 74 31 20 74 32 20 74 33 20 61 32 33 0a 74 65 t1 t2 t3 a23.te
1bc0: 73 74 20 6d 65 72 67 65 31 2d 34 2e 32 20 7b 5b st merge1-4.2 {[
1bd0: 73 61 6d 65 5f 66 69 6c 65 20 74 32 33 20 61 32 same_file t23 a2
1be0: 33 5d 7d 0a 0a 77 72 69 74 65 5f 66 69 6c 65 5f 3]}..write_file_
1bf0: 69 6e 64 65 6e 74 65 64 20 74 31 20 7b 0a 20 20 indented t1 {.
1c00: 31 31 31 20 2d 20 54 68 69 73 20 69 73 20 6c 69 111 - This is li
1c10: 6e 65 20 6f 6e 65 20 6f 66 20 74 68 65 20 64 65 ne one of the de
1c20: 6d 6f 20 70 72 6f 67 72 61 6d 20 2d 20 31 31 31 mo program - 111
1c30: 31 0a 20 20 32 32 32 20 2d 20 54 68 65 20 73 65 1. 222 - The se
1c40: 63 6f 6e 64 20 6c 69 6e 65 20 70 72 6f 67 72 61 cond line progra
1c50: 6d 20 6c 69 6e 65 20 69 6e 20 63 6f 64 65 20 2d m line in code -
1c60: 20 32 32 32 32 0a 20 20 33 33 33 20 2d 20 54 68 2222. 333 - Th
1c70: 69 73 20 69 73 20 61 20 74 65 73 74 20 6f 66 20 is is a test of
1c80: 74 68 65 20 6d 65 72 67 69 6e 67 20 61 6c 67 6f the merging algo
1c90: 68 6d 20 2d 20 33 33 33 33 0a 20 20 34 34 34 20 hm - 3333. 444
1ca0: 2d 20 49 66 20 61 6c 6c 20 67 6f 65 73 20 77 65 - If all goes we
1cb0: 6c 6c 2c 20 77 65 20 77 69 6c 6c 20 62 65 20 70 ll, we will be p
1cc0: 6c 65 61 73 65 64 20 2d 20 34 34 34 34 0a 20 20 leased - 4444.
1cd0: 35 35 35 20 2d 20 77 65 20 74 68 69 6e 6b 20 69 555 - we think i
1ce0: 74 20 77 65 6c 6c 20 61 6e 64 20 6f 74 68 65 72 t well and other
1cf0: 20 73 74 75 66 66 20 74 6f 6f 20 2d 20 35 35 35 stuff too - 555
1d00: 35 0a 7d 0a 77 72 69 74 65 5f 66 69 6c 65 5f 69 5.}.write_file_i
1d10: 6e 64 65 6e 74 65 64 20 74 32 20 7b 0a 20 20 31 ndented t2 {. 1
1d20: 31 31 20 2d 20 54 68 69 73 20 69 73 20 6c 69 6e 11 - This is lin
1d30: 65 20 6f 6e 65 20 6f 66 20 74 68 65 20 64 65 6d e one of the dem
1d40: 6f 20 70 72 6f 67 72 61 6d 20 2d 20 31 31 31 31 o program - 1111
1d50: 0a 20 20 32 32 32 20 2d 20 54 68 65 20 73 65 63 . 222 - The sec
1d60: 6f 6e 64 20 6c 69 6e 65 20 70 72 6f 67 72 61 6d ond line program
1d70: 20 6c 69 6e 65 20 69 6e 20 63 6f 64 65 20 2d 20 line in code -
1d80: 32 32 32 32 0a 20 20 33 33 33 20 2d 20 54 68 69 2222. 333 - Thi
1d90: 73 20 69 73 20 61 20 74 65 73 74 20 6f 66 20 74 s is a test of t
1da0: 68 65 20 6d 65 72 67 69 6e 67 20 61 6c 67 6f 68 he merging algoh
1db0: 6d 20 2d 20 33 33 33 33 0a 20 20 34 34 34 20 2d m - 3333. 444 -
1dc0: 20 49 66 20 61 6c 6c 20 67 6f 65 73 20 77 65 6c If all goes wel
1dd0: 6c 2c 20 77 65 20 77 69 6c 6c 20 62 65 20 70 6c l, we will be pl
1de0: 65 61 73 65 64 20 2d 20 34 34 34 34 0a 20 20 35 eased - 4444. 5
1df0: 35 35 20 2d 20 77 65 20 74 68 69 6e 6b 20 69 74 55 - we think it
1e00: 20 77 65 6c 6c 20 61 6e 64 20 6f 74 68 65 72 20 well and other
1e10: 73 74 75 66 66 20 74 6f 6f 20 2d 20 35 35 35 35 stuff too - 5555
1e20: 0a 20 20 36 36 36 20 2d 20 45 78 74 72 61 20 6c . 666 - Extra l
1e30: 69 6e 65 20 61 74 20 74 68 65 20 65 6e 64 20 6f ine at the end o
1e40: 66 20 74 68 65 20 66 69 6c 65 20 77 69 20 2d 20 f the file wi -
1e50: 36 36 36 36 0a 7d 0a 77 72 69 74 65 5f 66 69 6c 6666.}.write_fil
1e60: 65 5f 69 6e 64 65 6e 74 65 64 20 74 33 20 7b 0a e_indented t3 {.
1e70: 20 20 32 32 32 20 2d 20 54 68 65 20 73 65 63 6f 222 - The seco
1e80: 6e 64 20 6c 69 6e 65 20 70 72 6f 67 72 61 6d 20 nd line program
1e90: 6c 69 6e 65 20 69 6e 20 63 6f 64 65 20 2d 20 32 line in code - 2
1ea0: 32 32 32 0a 20 20 33 33 33 20 2d 20 54 68 69 73 222. 333 - This
1eb0: 20 69 73 20 61 20 74 65 73 74 20 6f 66 20 74 68 is a test of th
1ec0: 65 20 6d 65 72 67 69 6e 67 20 61 6c 67 6f 68 6d e merging algohm
1ed0: 20 2d 20 33 33 33 33 0a 20 20 34 34 34 20 2d 20 - 3333. 444 -
1ee0: 49 66 20 61 6c 6c 20 67 6f 65 73 20 77 65 6c 6c If all goes well
1ef0: 2c 20 77 65 20 77 69 6c 6c 20 62 65 20 70 6c 65 , we will be ple
1f00: 61 73 65 64 20 2d 20 34 34 34 34 0a 20 20 35 35 ased - 4444. 55
1f10: 35 20 2d 20 77 65 20 74 68 69 6e 6b 20 69 74 20 5 - we think it
1f20: 77 65 6c 6c 20 61 6e 64 20 6f 74 68 65 72 20 73 well and other s
1f30: 74 75 66 66 20 74 6f 6f 20 2d 20 35 35 35 35 0a tuff too - 5555.
1f40: 7d 0a 77 72 69 74 65 5f 66 69 6c 65 5f 69 6e 64 }.write_file_ind
1f50: 65 6e 74 65 64 20 74 33 32 20 7b 0a 20 20 32 32 ented t32 {. 22
1f60: 32 20 2d 20 54 68 65 20 73 65 63 6f 6e 64 20 6c 2 - The second l
1f70: 69 6e 65 20 70 72 6f 67 72 61 6d 20 6c 69 6e 65 ine program line
1f80: 20 69 6e 20 63 6f 64 65 20 2d 20 32 32 32 32 0a in code - 2222.
1f90: 20 20 33 33 33 20 2d 20 54 68 69 73 20 69 73 20 333 - This is
1fa0: 61 20 74 65 73 74 20 6f 66 20 74 68 65 20 6d 65 a test of the me
1fb0: 72 67 69 6e 67 20 61 6c 67 6f 68 6d 20 2d 20 33 rging algohm - 3
1fc0: 33 33 33 0a 20 20 34 34 34 20 2d 20 49 66 20 61 333. 444 - If a
1fd0: 6c 6c 20 67 6f 65 73 20 77 65 6c 6c 2c 20 77 65 ll goes well, we
1fe0: 20 77 69 6c 6c 20 62 65 20 70 6c 65 61 73 65 64 will be pleased
1ff0: 20 2d 20 34 34 34 34 0a 20 20 35 35 35 20 2d 20 - 4444. 555 -
2000: 77 65 20 74 68 69 6e 6b 20 69 74 20 77 65 6c 6c we think it well
2010: 20 61 6e 64 20 6f 74 68 65 72 20 73 74 75 66 66 and other stuff
2020: 20 74 6f 6f 20 2d 20 35 35 35 35 0a 20 20 36 36 too - 5555. 66
2030: 36 20 2d 20 45 78 74 72 61 20 6c 69 6e 65 20 61 6 - Extra line a
2040: 74 20 74 68 65 20 65 6e 64 20 6f 66 20 74 68 65 t the end of the
2050: 20 66 69 6c 65 20 77 69 20 2d 20 36 36 36 36 0a file wi - 6666.
2060: 7d 0a 66 6f 73 73 69 6c 20 74 65 73 74 2d 33 20 }.fossil test-3
2070: 74 31 20 74 33 20 74 32 20 61 33 32 0a 74 65 73 t1 t3 t2 a32.tes
2080: 74 20 6d 65 72 67 65 31 2d 35 2e 31 20 7b 5b 73 t merge1-5.1 {[s
2090: 61 6d 65 5f 66 69 6c 65 20 74 33 32 20 61 33 32 ame_file t32 a32
20a0: 5d 7d 0a 66 6f 73 73 69 6c 20 74 65 73 74 2d 33 ]}.fossil test-3
20b0: 20 74 31 20 74 32 20 74 33 20 61 32 33 0a 74 65 t1 t2 t3 a23.te
20c0: 73 74 20 6d 65 72 67 65 31 2d 35 2e 32 20 7b 5b st merge1-5.2 {[
20d0: 73 61 6d 65 5f 66 69 6c 65 20 74 33 32 20 61 32 same_file t32 a2
20e0: 33 5d 7d 0a 0a 77 72 69 74 65 5f 66 69 6c 65 5f 3]}..write_file_
20f0: 69 6e 64 65 6e 74 65 64 20 74 31 20 7b 0a 20 20 indented t1 {.
2100: 31 31 31 20 2d 20 54 68 69 73 20 69 73 20 6c 69 111 - This is li
2110: 6e 65 20 6f 6e 65 20 6f 66 20 74 68 65 20 64 65 ne one of the de
2120: 6d 6f 20 70 72 6f 67 72 61 6d 20 2d 20 31 31 31 mo program - 111
2130: 31 0a 20 20 32 32 32 20 2d 20 54 68 65 20 73 65 1. 222 - The se
2140: 63 6f 6e 64 20 6c 69 6e 65 20 70 72 6f 67 72 61 cond line progra
2150: 6d 20 6c 69 6e 65 20 69 6e 20 63 6f 64 65 20 2d m line in code -
2160: 20 32 32 32 32 0a 20 20 33 33 33 20 2d 20 54 68 2222. 333 - Th
2170: 69 73 20 69 73 20 61 20 74 65 73 74 20 6f 66 20 is is a test of
2180: 74 68 65 20 6d 65 72 67 69 6e 67 20 61 6c 67 6f the merging algo
2190: 68 6d 20 2d 20 33 33 33 33 0a 20 20 34 34 34 20 hm - 3333. 444
21a0: 2d 20 49 66 20 61 6c 6c 20 67 6f 65 73 20 77 65 - If all goes we
21b0: 6c 6c 2c 20 77 65 20 77 69 6c 6c 20 62 65 20 70 ll, we will be p
21c0: 6c 65 61 73 65 64 20 2d 20 34 34 34 34 0a 20 20 leased - 4444.
21d0: 35 35 35 20 2d 20 77 65 20 74 68 69 6e 6b 20 69 555 - we think i
21e0: 74 20 77 65 6c 6c 20 61 6e 64 20 6f 74 68 65 72 t well and other
21f0: 20 73 74 75 66 66 20 74 6f 6f 20 2d 20 35 35 35 stuff too - 555
2200: 35 0a 7d 0a 77 72 69 74 65 5f 66 69 6c 65 5f 69 5.}.write_file_i
2210: 6e 64 65 6e 74 65 64 20 74 32 20 7b 0a 20 20 31 ndented t2 {. 1
2220: 31 31 20 2d 20 54 68 69 73 20 69 73 20 6c 69 6e 11 - This is lin
2230: 65 20 6f 6e 65 20 6f 66 20 74 68 65 20 64 65 6d e one of the dem
2240: 6f 20 70 72 6f 67 72 61 6d 20 2d 20 31 31 31 31 o program - 1111
2250: 0a 20 20 33 33 33 20 2d 20 54 68 69 73 20 69 73 . 333 - This is
2260: 20 61 20 74 65 73 74 20 6f 66 20 74 68 65 20 6d a test of the m
2270: 65 72 67 69 6e 67 20 61 6c 67 6f 68 6d 20 2d 20 erging algohm -
2280: 33 33 33 33 0a 20 20 34 34 34 20 2d 20 49 66 20 3333. 444 - If
2290: 61 6c 6c 20 67 6f 65 73 20 77 65 6c 6c 2c 20 77 all goes well, w
22a0: 65 20 77 69 6c 6c 20 62 65 20 70 6c 65 61 73 65 e will be please
22b0: 64 20 2d 20 34 34 34 34 0a 20 20 35 35 35 20 2d d - 4444. 555 -
22c0: 20 77 65 20 74 68 69 6e 6b 20 69 74 20 77 65 6c we think it wel
22d0: 6c 20 61 6e 64 20 6f 74 68 65 72 20 73 74 75 66 l and other stuf
22e0: 66 20 74 6f 6f 20 2d 20 35 35 35 35 0a 7d 0a 77 f too - 5555.}.w
22f0: 72 69 74 65 5f 66 69 6c 65 5f 69 6e 64 65 6e 74 rite_file_indent
2300: 65 64 20 74 33 20 7b 0a 20 20 31 31 31 20 2d 20 ed t3 {. 111 -
2310: 54 68 69 73 20 69 73 20 6c 69 6e 65 20 6f 6e 65 This is line one
2320: 20 6f 66 20 74 68 65 20 64 65 6d 6f 20 70 72 6f of the demo pro
2330: 67 72 61 6d 20 2d 20 31 31 31 31 0a 20 20 32 32 gram - 1111. 22
2340: 32 20 2d 20 54 68 65 20 73 65 63 6f 6e 64 20 6c 2 - The second l
2350: 69 6e 65 20 70 72 6f 67 72 61 6d 20 6c 69 6e 65 ine program line
2360: 20 69 6e 20 63 6f 64 65 20 2d 20 32 32 32 32 0a in code - 2222.
2370: 20 20 33 33 33 20 2d 20 54 68 69 73 20 69 73 20 333 - This is
2380: 61 20 74 65 73 74 20 6f 66 20 74 68 65 20 6d 65 a test of the me
2390: 72 67 69 6e 67 20 61 6c 67 6f 68 6d 20 2d 20 33 rging algohm - 3
23a0: 33 33 33 0a 20 20 35 35 35 20 2d 20 77 65 20 74 333. 555 - we t
23b0: 68 69 6e 6b 20 69 74 20 77 65 6c 6c 20 61 6e 64 hink it well and
23c0: 20 6f 74 68 65 72 20 73 74 75 66 66 20 74 6f 6f other stuff too
23d0: 20 2d 20 35 35 35 35 0a 7d 0a 77 72 69 74 65 5f - 5555.}.write_
23e0: 66 69 6c 65 5f 69 6e 64 65 6e 74 65 64 20 74 33 file_indented t3
23f0: 32 20 7b 0a 20 20 31 31 31 20 2d 20 54 68 69 73 2 {. 111 - This
2400: 20 69 73 20 6c 69 6e 65 20 6f 6e 65 20 6f 66 20 is line one of
2410: 74 68 65 20 64 65 6d 6f 20 70 72 6f 67 72 61 6d the demo program
2420: 20 2d 20 31 31 31 31 0a 20 20 33 33 33 20 2d 20 - 1111. 333 -
2430: 54 68 69 73 20 69 73 20 61 20 74 65 73 74 20 6f This is a test o
2440: 66 20 74 68 65 20 6d 65 72 67 69 6e 67 20 61 6c f the merging al
2450: 67 6f 68 6d 20 2d 20 33 33 33 33 0a 20 20 35 35 gohm - 3333. 55
2460: 35 20 2d 20 77 65 20 74 68 69 6e 6b 20 69 74 20 5 - we think it
2470: 77 65 6c 6c 20 61 6e 64 20 6f 74 68 65 72 20 73 well and other s
2480: 74 75 66 66 20 74 6f 6f 20 2d 20 35 35 35 35 0a tuff too - 5555.
2490: 7d 0a 66 6f 73 73 69 6c 20 74 65 73 74 2d 33 20 }.fossil test-3
24a0: 74 31 20 74 33 20 74 32 20 61 33 32 0a 74 65 73 t1 t3 t2 a32.tes
24b0: 74 20 6d 65 72 67 65 31 2d 36 2e 31 20 7b 5b 73 t merge1-6.1 {[s
24c0: 61 6d 65 5f 66 69 6c 65 20 74 33 32 20 61 33 32 ame_file t32 a32
24d0: 5d 7d 0a 66 6f 73 73 69 6c 20 74 65 73 74 2d 33 ]}.fossil test-3
24e0: 20 74 31 20 74 32 20 74 33 20 61 32 33 0a 74 65 t1 t2 t3 a23.te
24f0: 73 74 20 6d 65 72 67 65 31 2d 36 2e 32 20 7b 5b st merge1-6.2 {[
2500: 73 61 6d 65 5f 66 69 6c 65 20 74 33 32 20 61 32 same_file t32 a2
2510: 33 5d 7d 0a 0a 77 72 69 74 65 5f 66 69 6c 65 5f 3]}..write_file_
2520: 69 6e 64 65 6e 74 65 64 20 74 31 20 7b 0a 20 20 indented t1 {.
2530: 61 62 63 64 0a 20 20 65 66 67 68 0a 20 20 69 6a abcd. efgh. ij
2540: 6b 6c 0a 20 20 6d 6e 6f 70 0a 20 20 71 72 73 74 kl. mnop. qrst
2550: 0a 20 20 75 76 77 78 0a 20 20 79 7a 41 42 0a 20 . uvwx. yzAB.
2560: 20 43 44 45 46 0a 20 20 47 48 49 4a 0a 20 20 4b CDEF. GHIJ. K
2570: 4c 4d 4e 0a 20 20 4f 50 51 52 0a 20 20 53 54 55 LMN. OPQR. STU
2580: 56 0a 20 20 58 59 5a 2e 0a 7d 0a 77 72 69 74 65 V. XYZ..}.write
2590: 5f 66 69 6c 65 5f 69 6e 64 65 6e 74 65 64 20 74 _file_indented t
25a0: 32 20 7b 0a 20 20 61 62 63 64 0a 20 20 65 66 67 2 {. abcd. efg
25b0: 68 20 32 0a 20 20 69 6a 6b 6c 20 32 0a 20 20 6d h 2. ijkl 2. m
25c0: 6e 6f 70 20 32 0a 20 20 71 72 73 74 0a 20 20 75 nop 2. qrst. u
25d0: 76 77 78 0a 20 20 79 7a 41 42 20 32 0a 20 20 43 vwx. yzAB 2. C
25e0: 44 45 46 20 32 0a 20 20 47 48 49 4a 20 32 0a 20 DEF 2. GHIJ 2.
25f0: 20 4b 4c 4d 4e 0a 20 20 4f 50 51 52 0a 20 20 53 KLMN. OPQR. S
2600: 54 55 56 0a 20 20 58 59 5a 2e 0a 7d 0a 77 72 69 TUV. XYZ..}.wri
2610: 74 65 5f 66 69 6c 65 5f 69 6e 64 65 6e 74 65 64 te_file_indented
2620: 20 74 33 20 7b 0a 20 20 61 62 63 64 0a 20 20 65 t3 {. abcd. e
2630: 66 67 68 0a 20 20 69 6a 6b 6c 0a 20 20 6d 6e 6f fgh. ijkl. mno
2640: 70 20 33 0a 20 20 71 72 73 74 20 33 0a 20 20 75 p 3. qrst 3. u
2650: 76 77 78 20 33 0a 20 20 79 7a 41 42 20 33 0a 20 vwx 3. yzAB 3.
2660: 20 43 44 45 46 0a 20 20 47 48 49 4a 0a 20 20 4b CDEF. GHIJ. K
2670: 4c 4d 4e 0a 20 20 4f 50 51 52 0a 20 20 53 54 55 LMN. OPQR. STU
2680: 56 0a 20 20 58 59 5a 2e 0a 7d 0a 77 72 69 74 65 V. XYZ..}.write
2690: 5f 66 69 6c 65 5f 69 6e 64 65 6e 74 65 64 20 74 _file_indented t
26a0: 32 33 20 7b 0a 20 20 61 62 63 64 0a 20 20 3e 3e 23 {. abcd. >>
26b0: 3e 3e 3e 3e 3e 20 42 45 47 49 4e 20 4d 45 52 47 >>>>> BEGIN MERG
26c0: 45 20 43 4f 4e 46 4c 49 43 54 0a 20 20 65 66 67 E CONFLICT. efg
26d0: 68 20 32 0a 20 20 69 6a 6b 6c 20 32 0a 20 20 6d h 2. ijkl 2. m
26e0: 6e 6f 70 20 32 0a 20 20 71 72 73 74 0a 20 20 75 nop 2. qrst. u
26f0: 76 77 78 0a 20 20 79 7a 41 42 20 32 0a 20 20 43 vwx. yzAB 2. C
2700: 44 45 46 20 32 0a 20 20 47 48 49 4a 20 32 0a 20 DEF 2. GHIJ 2.
2710: 20 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ===============
2720: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 0a 20 20 =============.
2730: 65 66 67 68 0a 20 20 69 6a 6b 6c 0a 20 20 6d 6e efgh. ijkl. mn
2740: 6f 70 20 33 0a 20 20 71 72 73 74 20 33 0a 20 20 op 3. qrst 3.
2750: 75 76 77 78 20 33 0a 20 20 79 7a 41 42 20 33 0a uvwx 3. yzAB 3.
2760: 20 20 43 44 45 46 0a 20 20 47 48 49 4a 0a 20 20 CDEF. GHIJ.
2770: 3c 3c 3c 3c 3c 3c 3c 20 45 4e 44 20 4d 45 52 47 <<<<<<< END MERG
2780: 45 20 43 4f 4e 46 4c 49 43 54 0a 20 20 4b 4c 4d E CONFLICT. KLM
2790: 4e 0a 20 20 4f 50 51 52 0a 20 20 53 54 55 56 0a N. OPQR. STUV.
27a0: 20 20 58 59 5a 2e 0a 7d 0a 66 6f 73 73 69 6c 20 XYZ..}.fossil
27b0: 74 65 73 74 2d 33 20 74 31 20 74 32 20 74 33 20 test-3 t1 t2 t3
27c0: 61 32 33 0a 74 65 73 74 20 6d 65 72 67 65 31 2d a23.test merge1-
27d0: 37 2e 31 20 7b 5b 73 61 6d 65 5f 66 69 6c 65 20 7.1 {[same_file
27e0: 74 32 33 20 61 32 33 5d 7d 0a 0a 77 72 69 74 65 t23 a23]}..write
27f0: 5f 66 69 6c 65 5f 69 6e 64 65 6e 74 65 64 20 74 _file_indented t
2800: 32 20 7b 0a 20 20 61 62 63 64 0a 20 20 65 66 67 2 {. abcd. efg
2810: 68 20 32 0a 20 20 69 6a 6b 6c 20 32 0a 20 20 6d h 2. ijkl 2. m
2820: 6e 6f 70 20 0a 20 20 71 72 73 74 0a 20 20 75 76 nop . qrst. uv
2830: 77 78 0a 20 20 79 7a 41 42 20 32 0a 20 20 43 44 wx. yzAB 2. CD
2840: 45 46 20 32 0a 20 20 47 48 49 4a 20 32 0a 20 20 EF 2. GHIJ 2.
2850: 4b 4c 4d 4e 0a 20 20 4f 50 51 52 0a 20 20 53 54 KLMN. OPQR. ST
2860: 55 56 0a 20 20 58 59 5a 2e 0a 7d 0a 77 72 69 74 UV. XYZ..}.writ
2870: 65 5f 66 69 6c 65 5f 69 6e 64 65 6e 74 65 64 20 e_file_indented
2880: 74 33 20 7b 0a 20 20 61 62 63 64 0a 20 20 65 66 t3 {. abcd. ef
2890: 67 68 0a 20 20 69 6a 6b 6c 0a 20 20 6d 6e 6f 70 gh. ijkl. mnop
28a0: 20 33 0a 20 20 71 72 73 74 20 33 0a 20 20 75 76 3. qrst 3. uv
28b0: 77 78 20 33 0a 20 20 79 7a 41 42 20 33 0a 20 20 wx 3. yzAB 3.
28c0: 43 44 45 46 0a 20 20 47 48 49 4a 0a 20 20 4b 4c CDEF. GHIJ. KL
28d0: 4d 4e 0a 20 20 4f 50 51 52 0a 20 20 53 54 55 56 MN. OPQR. STUV
28e0: 0a 20 20 58 59 5a 2e 0a 7d 0a 77 72 69 74 65 5f . XYZ..}.write_
28f0: 66 69 6c 65 5f 69 6e 64 65 6e 74 65 64 20 74 32 file_indented t2
2900: 33 20 7b 0a 20 20 61 62 63 64 0a 20 20 65 66 67 3 {. abcd. efg
2910: 68 20 32 0a 20 20 69 6a 6b 6c 20 32 0a 20 20 3e h 2. ijkl 2. >
2920: 3e 3e 3e 3e 3e 3e 20 42 45 47 49 4e 20 4d 45 52 >>>>>> BEGIN MER
2930: 47 45 20 43 4f 4e 46 4c 49 43 54 0a 20 20 6d 6e GE CONFLICT. mn
2940: 6f 70 0a 20 20 71 72 73 74 0a 20 20 75 76 77 78 op. qrst. uvwx
2950: 0a 20 20 79 7a 41 42 20 32 0a 20 20 43 44 45 46 . yzAB 2. CDEF
2960: 20 32 0a 20 20 47 48 49 4a 20 32 0a 20 20 3d 3d 2. GHIJ 2. ==
2970: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
2980: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 0a 20 20 6d 6e 6f ==========. mno
2990: 70 20 33 0a 20 20 71 72 73 74 20 33 0a 20 20 75 p 3. qrst 3. u
29a0: 76 77 78 20 33 0a 20 20 79 7a 41 42 20 33 0a 20 vwx 3. yzAB 3.
29b0: 20 43 44 45 46 0a 20 20 47 48 49 4a 0a 20 20 3c CDEF. GHIJ. <
29c0: 3c 3c 3c 3c 3c 3c 20 45 4e 44 20 4d 45 52 47 45 <<<<<< END MERGE
29d0: 20 43 4f 4e 46 4c 49 43 54 0a 20 20 4b 4c 4d 4e CONFLICT. KLMN
29e0: 0a 20 20 4f 50 51 52 0a 20 20 53 54 55 56 0a 20 . OPQR. STUV.
29f0: 20 58 59 5a 2e 0a 7d 0a 66 6f 73 73 69 6c 20 74 XYZ..}.fossil t
2a00: 65 73 74 2d 33 20 74 31 20 74 32 20 74 33 20 61 est-3 t1 t2 t3 a
2a10: 32 33 0a 74 65 73 74 20 6d 65 72 67 65 31 2d 37 23.test merge1-7
2a20: 2e 32 20 7b 5b 73 61 6d 65 5f 66 69 6c 65 20 74 .2 {[same_file t
2a30: 32 33 20 61 32 33 5d 7d 0a 23 a23]}.