dbda8d6ce9 2007-07-21 drh: # dbda8d6ce9 2007-07-21 drh: # Copyright (c) 2006 D. Richard Hipp dbda8d6ce9 2007-07-21 drh: # dbda8d6ce9 2007-07-21 drh: # This program is free software; you can redistribute it and/or dbda8d6ce9 2007-07-21 drh: # modify it under the terms of the GNU General Public dbda8d6ce9 2007-07-21 drh: # License version 2 as published by the Free Software Foundation. dbda8d6ce9 2007-07-21 drh: # dbda8d6ce9 2007-07-21 drh: # This program is distributed in the hope that it will be useful, dbda8d6ce9 2007-07-21 drh: # but WITHOUT ANY WARRANTY; without even the implied warranty of dbda8d6ce9 2007-07-21 drh: # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU dbda8d6ce9 2007-07-21 drh: # General Public License for more details. dbda8d6ce9 2007-07-21 drh: # dbda8d6ce9 2007-07-21 drh: # You should have received a copy of the GNU General Public dbda8d6ce9 2007-07-21 drh: # License along with this library; if not, write to the dbda8d6ce9 2007-07-21 drh: # Free Software Foundation, Inc., 59 Temple Place - Suite 330, dbda8d6ce9 2007-07-21 drh: # Boston, MA 02111-1307, USA. dbda8d6ce9 2007-07-21 drh: # dbda8d6ce9 2007-07-21 drh: # Author contact information: dbda8d6ce9 2007-07-21 drh: # drh@hwaci.com dbda8d6ce9 2007-07-21 drh: # http://www.hwaci.com/drh/ dbda8d6ce9 2007-07-21 drh: # dbda8d6ce9 2007-07-21 drh: ############################################################################ dbda8d6ce9 2007-07-21 drh: # 81122988ba 2009-03-21 drh: # Tests of the 3-way merge dbda8d6ce9 2007-07-21 drh: # dbda8d6ce9 2007-07-21 drh: dbda8d6ce9 2007-07-21 drh: write_file_indented t1 { dbda8d6ce9 2007-07-21 drh: 111 - This is line one of the demo program - 1111 dbda8d6ce9 2007-07-21 drh: 222 - The second line program line in code - 2222 dbda8d6ce9 2007-07-21 drh: 333 - This is a test of the merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 444 - If all goes well, we will be pleased - 4444 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: write_file_indented t2 { dbda8d6ce9 2007-07-21 drh: 111 - This is line ONE of the demo program - 1111 dbda8d6ce9 2007-07-21 drh: 222 - The second line program line in code - 2222 dbda8d6ce9 2007-07-21 drh: 333 - This is a test of the merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 444 - If all goes well, we will be pleased - 4444 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: write_file_indented t3 { dbda8d6ce9 2007-07-21 drh: 111 - This is line one of the demo program - 1111 dbda8d6ce9 2007-07-21 drh: 222 - The second line program line in code - 2222 dbda8d6ce9 2007-07-21 drh: 333 - This is a test OF THE merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 444 - If all goes well, we will be pleased - 4444 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: write_file_indented t23 { dbda8d6ce9 2007-07-21 drh: 111 - This is line ONE of the demo program - 1111 dbda8d6ce9 2007-07-21 drh: 222 - The second line program line in code - 2222 dbda8d6ce9 2007-07-21 drh: 333 - This is a test OF THE merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 444 - If all goes well, we will be pleased - 4444 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: fossil test-3 t1 t3 t2 a32 dbda8d6ce9 2007-07-21 drh: test merge1-1.1 {[same_file t23 a32]} dbda8d6ce9 2007-07-21 drh: fossil test-3 t1 t2 t3 a23 dbda8d6ce9 2007-07-21 drh: test merge1-1.2 {[same_file t23 a23]} dbda8d6ce9 2007-07-21 drh: dbda8d6ce9 2007-07-21 drh: write_file_indented t1 { dbda8d6ce9 2007-07-21 drh: 111 - This is line one of the demo program - 1111 dbda8d6ce9 2007-07-21 drh: 222 - The second line program line in code - 2222 dbda8d6ce9 2007-07-21 drh: 333 - This is a test of the merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 444 - If all goes well, we will be pleased - 4444 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: write_file_indented t2 { dbda8d6ce9 2007-07-21 drh: 111 - This is line ONE of the demo program - 1111 dbda8d6ce9 2007-07-21 drh: 222 - The second line program line in code - 2222 dbda8d6ce9 2007-07-21 drh: 333 - This is a test of the merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 444 - If all goes well, we will be pleased - 4444 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: write_file_indented t3 { dbda8d6ce9 2007-07-21 drh: 111 - This is line one OF the demo program - 1111 dbda8d6ce9 2007-07-21 drh: 222 - The second line program line in code - 2222 dbda8d6ce9 2007-07-21 drh: 333 - This is a test of the merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 444 - If all goes well, we will be pleased - 4444 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: write_file_indented t23 { 81122988ba 2009-03-21 drh: >>>>>>> BEGIN MERGE CONFLICT 36b96b8616 2007-11-16 drh: 111 - This is line ONE of the demo program - 1111 81122988ba 2009-03-21 drh: ============================ 36b96b8616 2007-11-16 drh: 111 - This is line one OF the demo program - 1111 81122988ba 2009-03-21 drh: <<<<<<< END MERGE CONFLICT 36b96b8616 2007-11-16 drh: 222 - The second line program line in code - 2222 36b96b8616 2007-11-16 drh: 333 - This is a test of the merging algohm - 3333 36b96b8616 2007-11-16 drh: 444 - If all goes well, we will be pleased - 4444 36b96b8616 2007-11-16 drh: 555 - we think it well and other stuff too - 5555 36b96b8616 2007-11-16 drh: } 36b96b8616 2007-11-16 drh: write_file_indented t32 { 81122988ba 2009-03-21 drh: >>>>>>> BEGIN MERGE CONFLICT 36b96b8616 2007-11-16 drh: 111 - This is line one OF the demo program - 1111 81122988ba 2009-03-21 drh: ============================ 36b96b8616 2007-11-16 drh: 111 - This is line ONE of the demo program - 1111 81122988ba 2009-03-21 drh: <<<<<<< END MERGE CONFLICT dbda8d6ce9 2007-07-21 drh: 222 - The second line program line in code - 2222 dbda8d6ce9 2007-07-21 drh: 333 - This is a test of the merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 444 - If all goes well, we will be pleased - 4444 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: fossil test-3 t1 t3 t2 a32 36b96b8616 2007-11-16 drh: test merge1-2.1 {[same_file t32 a32]} dbda8d6ce9 2007-07-21 drh: fossil test-3 t1 t2 t3 a23 dbda8d6ce9 2007-07-21 drh: test merge1-2.2 {[same_file t23 a23]} dbda8d6ce9 2007-07-21 drh: dbda8d6ce9 2007-07-21 drh: write_file_indented t1 { dbda8d6ce9 2007-07-21 drh: 111 - This is line one of the demo program - 1111 dbda8d6ce9 2007-07-21 drh: 222 - The second line program line in code - 2222 dbda8d6ce9 2007-07-21 drh: 333 - This is a test of the merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 444 - If all goes well, we will be pleased - 4444 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: write_file_indented t2 { dbda8d6ce9 2007-07-21 drh: 111 - This is line ONE of the demo program - 1111 dbda8d6ce9 2007-07-21 drh: 222 - The second line program line in code - 2222 dbda8d6ce9 2007-07-21 drh: 333 - This is a test of the merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 444 - If all goes well, we will be pleased - 4444 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: write_file_indented t3 { dbda8d6ce9 2007-07-21 drh: 111 - This is line ONE of the demo program - 1111 dbda8d6ce9 2007-07-21 drh: 222 - The second line program line in code - 2222 dbda8d6ce9 2007-07-21 drh: 333 - This is a test of the merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 444 - If all goes well, we will be pleased - 4444 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: write_file_indented t23 { dbda8d6ce9 2007-07-21 drh: 111 - This is line ONE of the demo program - 1111 dbda8d6ce9 2007-07-21 drh: 222 - The second line program line in code - 2222 dbda8d6ce9 2007-07-21 drh: 333 - This is a test of the merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 444 - If all goes well, we will be pleased - 4444 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: fossil test-3 t1 t3 t2 a32 dbda8d6ce9 2007-07-21 drh: test merge1-3.1 {[same_file t23 a32]} dbda8d6ce9 2007-07-21 drh: fossil test-3 t1 t2 t3 a23 dbda8d6ce9 2007-07-21 drh: test merge1-3.2 {[same_file t23 a23]} dbda8d6ce9 2007-07-21 drh: dbda8d6ce9 2007-07-21 drh: write_file_indented t1 { dbda8d6ce9 2007-07-21 drh: 111 - This is line one of the demo program - 1111 dbda8d6ce9 2007-07-21 drh: 222 - The second line program line in code - 2222 dbda8d6ce9 2007-07-21 drh: 333 - This is a test of the merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 444 - If all goes well, we will be pleased - 4444 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: write_file_indented t2 { dbda8d6ce9 2007-07-21 drh: 000 - Zero lines added to the beginning of - 0000 dbda8d6ce9 2007-07-21 drh: 111 - This is line one of the demo program - 1111 dbda8d6ce9 2007-07-21 drh: 222 - The second line program line in code - 2222 dbda8d6ce9 2007-07-21 drh: 333 - This is a test of the merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 444 - If all goes well, we will be pleased - 4444 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: write_file_indented t3 { dbda8d6ce9 2007-07-21 drh: 222 - The second line program line in code - 2222 dbda8d6ce9 2007-07-21 drh: 333 - This is a test of the merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 444 - If all goes well, we will be pleased - 4444 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: write_file_indented t32 { 81122988ba 2009-03-21 drh: >>>>>>> BEGIN MERGE CONFLICT 81122988ba 2009-03-21 drh: ============================ dbda8d6ce9 2007-07-21 drh: 000 - Zero lines added to the beginning of - 0000 81122988ba 2009-03-21 drh: 111 - This is line one of the demo program - 1111 81122988ba 2009-03-21 drh: <<<<<<< END MERGE CONFLICT dbda8d6ce9 2007-07-21 drh: 222 - The second line program line in code - 2222 dbda8d6ce9 2007-07-21 drh: 333 - This is a test of the merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 444 - If all goes well, we will be pleased - 4444 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: write_file_indented t23 { 81122988ba 2009-03-21 drh: >>>>>>> BEGIN MERGE CONFLICT dbda8d6ce9 2007-07-21 drh: 000 - Zero lines added to the beginning of - 0000 81122988ba 2009-03-21 drh: 111 - This is line one of the demo program - 1111 81122988ba 2009-03-21 drh: ============================ 81122988ba 2009-03-21 drh: <<<<<<< END MERGE CONFLICT dbda8d6ce9 2007-07-21 drh: 222 - The second line program line in code - 2222 dbda8d6ce9 2007-07-21 drh: 333 - This is a test of the merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 444 - If all goes well, we will be pleased - 4444 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: fossil test-3 t1 t3 t2 a32 dbda8d6ce9 2007-07-21 drh: test merge1-4.1 {[same_file t32 a32]} dbda8d6ce9 2007-07-21 drh: fossil test-3 t1 t2 t3 a23 dbda8d6ce9 2007-07-21 drh: test merge1-4.2 {[same_file t23 a23]} dbda8d6ce9 2007-07-21 drh: dbda8d6ce9 2007-07-21 drh: write_file_indented t1 { dbda8d6ce9 2007-07-21 drh: 111 - This is line one of the demo program - 1111 dbda8d6ce9 2007-07-21 drh: 222 - The second line program line in code - 2222 dbda8d6ce9 2007-07-21 drh: 333 - This is a test of the merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 444 - If all goes well, we will be pleased - 4444 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: write_file_indented t2 { dbda8d6ce9 2007-07-21 drh: 111 - This is line one of the demo program - 1111 dbda8d6ce9 2007-07-21 drh: 222 - The second line program line in code - 2222 dbda8d6ce9 2007-07-21 drh: 333 - This is a test of the merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 444 - If all goes well, we will be pleased - 4444 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: 666 - Extra line at the end of the file wi - 6666 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: write_file_indented t3 { dbda8d6ce9 2007-07-21 drh: 222 - The second line program line in code - 2222 dbda8d6ce9 2007-07-21 drh: 333 - This is a test of the merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 444 - If all goes well, we will be pleased - 4444 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: write_file_indented t32 { dbda8d6ce9 2007-07-21 drh: 222 - The second line program line in code - 2222 dbda8d6ce9 2007-07-21 drh: 333 - This is a test of the merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 444 - If all goes well, we will be pleased - 4444 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: 666 - Extra line at the end of the file wi - 6666 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: fossil test-3 t1 t3 t2 a32 dbda8d6ce9 2007-07-21 drh: test merge1-5.1 {[same_file t32 a32]} dbda8d6ce9 2007-07-21 drh: fossil test-3 t1 t2 t3 a23 dbda8d6ce9 2007-07-21 drh: test merge1-5.2 {[same_file t32 a23]} dbda8d6ce9 2007-07-21 drh: dbda8d6ce9 2007-07-21 drh: write_file_indented t1 { dbda8d6ce9 2007-07-21 drh: 111 - This is line one of the demo program - 1111 dbda8d6ce9 2007-07-21 drh: 222 - The second line program line in code - 2222 dbda8d6ce9 2007-07-21 drh: 333 - This is a test of the merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 444 - If all goes well, we will be pleased - 4444 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: write_file_indented t2 { dbda8d6ce9 2007-07-21 drh: 111 - This is line one of the demo program - 1111 dbda8d6ce9 2007-07-21 drh: 333 - This is a test of the merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 444 - If all goes well, we will be pleased - 4444 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: write_file_indented t3 { dbda8d6ce9 2007-07-21 drh: 111 - This is line one of the demo program - 1111 dbda8d6ce9 2007-07-21 drh: 222 - The second line program line in code - 2222 dbda8d6ce9 2007-07-21 drh: 333 - This is a test of the merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: write_file_indented t32 { dbda8d6ce9 2007-07-21 drh: 111 - This is line one of the demo program - 1111 dbda8d6ce9 2007-07-21 drh: 333 - This is a test of the merging algohm - 3333 dbda8d6ce9 2007-07-21 drh: 555 - we think it well and other stuff too - 5555 dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: fossil test-3 t1 t3 t2 a32 dbda8d6ce9 2007-07-21 drh: test merge1-6.1 {[same_file t32 a32]} dbda8d6ce9 2007-07-21 drh: fossil test-3 t1 t2 t3 a23 dbda8d6ce9 2007-07-21 drh: test merge1-6.2 {[same_file t32 a23]} dbda8d6ce9 2007-07-21 drh: dbda8d6ce9 2007-07-21 drh: write_file_indented t1 { 81122988ba 2009-03-21 drh: abcd 81122988ba 2009-03-21 drh: efgh 81122988ba 2009-03-21 drh: ijkl 81122988ba 2009-03-21 drh: mnop 81122988ba 2009-03-21 drh: qrst 81122988ba 2009-03-21 drh: uvwx 81122988ba 2009-03-21 drh: yzAB 81122988ba 2009-03-21 drh: CDEF 81122988ba 2009-03-21 drh: GHIJ 81122988ba 2009-03-21 drh: KLMN 81122988ba 2009-03-21 drh: OPQR 81122988ba 2009-03-21 drh: STUV 81122988ba 2009-03-21 drh: XYZ. 81122988ba 2009-03-21 drh: } 81122988ba 2009-03-21 drh: write_file_indented t2 { 81122988ba 2009-03-21 drh: abcd 81122988ba 2009-03-21 drh: efgh 2 81122988ba 2009-03-21 drh: ijkl 2 81122988ba 2009-03-21 drh: mnop 2 81122988ba 2009-03-21 drh: qrst 81122988ba 2009-03-21 drh: uvwx 81122988ba 2009-03-21 drh: yzAB 2 81122988ba 2009-03-21 drh: CDEF 2 81122988ba 2009-03-21 drh: GHIJ 2 81122988ba 2009-03-21 drh: KLMN 81122988ba 2009-03-21 drh: OPQR 81122988ba 2009-03-21 drh: STUV 81122988ba 2009-03-21 drh: XYZ. 81122988ba 2009-03-21 drh: } 81122988ba 2009-03-21 drh: write_file_indented t3 { 81122988ba 2009-03-21 drh: abcd 81122988ba 2009-03-21 drh: efgh 81122988ba 2009-03-21 drh: ijkl 81122988ba 2009-03-21 drh: mnop 3 81122988ba 2009-03-21 drh: qrst 3 81122988ba 2009-03-21 drh: uvwx 3 81122988ba 2009-03-21 drh: yzAB 3 81122988ba 2009-03-21 drh: CDEF 81122988ba 2009-03-21 drh: GHIJ 81122988ba 2009-03-21 drh: KLMN 81122988ba 2009-03-21 drh: OPQR 81122988ba 2009-03-21 drh: STUV 81122988ba 2009-03-21 drh: XYZ. 81122988ba 2009-03-21 drh: } 81122988ba 2009-03-21 drh: write_file_indented t23 { 81122988ba 2009-03-21 drh: abcd 81122988ba 2009-03-21 drh: >>>>>>> BEGIN MERGE CONFLICT 81122988ba 2009-03-21 drh: efgh 2 81122988ba 2009-03-21 drh: ijkl 2 81122988ba 2009-03-21 drh: mnop 2 81122988ba 2009-03-21 drh: qrst 81122988ba 2009-03-21 drh: uvwx 81122988ba 2009-03-21 drh: yzAB 2 81122988ba 2009-03-21 drh: CDEF 2 81122988ba 2009-03-21 drh: GHIJ 2 81122988ba 2009-03-21 drh: ============================ 81122988ba 2009-03-21 drh: efgh 81122988ba 2009-03-21 drh: ijkl 81122988ba 2009-03-21 drh: mnop 3 81122988ba 2009-03-21 drh: qrst 3 81122988ba 2009-03-21 drh: uvwx 3 81122988ba 2009-03-21 drh: yzAB 3 81122988ba 2009-03-21 drh: CDEF 81122988ba 2009-03-21 drh: GHIJ 81122988ba 2009-03-21 drh: <<<<<<< END MERGE CONFLICT 81122988ba 2009-03-21 drh: KLMN 81122988ba 2009-03-21 drh: OPQR 81122988ba 2009-03-21 drh: STUV 81122988ba 2009-03-21 drh: XYZ. dbda8d6ce9 2007-07-21 drh: } 81122988ba 2009-03-21 drh: fossil test-3 t1 t2 t3 a23 81122988ba 2009-03-21 drh: test merge1-7.1 {[same_file t23 a23]} 81122988ba 2009-03-21 drh: dbda8d6ce9 2007-07-21 drh: write_file_indented t2 { 81122988ba 2009-03-21 drh: abcd 81122988ba 2009-03-21 drh: efgh 2 81122988ba 2009-03-21 drh: ijkl 2 81122988ba 2009-03-21 drh: mnop 81122988ba 2009-03-21 drh: qrst 81122988ba 2009-03-21 drh: uvwx 81122988ba 2009-03-21 drh: yzAB 2 81122988ba 2009-03-21 drh: CDEF 2 81122988ba 2009-03-21 drh: GHIJ 2 81122988ba 2009-03-21 drh: KLMN 81122988ba 2009-03-21 drh: OPQR 81122988ba 2009-03-21 drh: STUV 81122988ba 2009-03-21 drh: XYZ. dbda8d6ce9 2007-07-21 drh: } dbda8d6ce9 2007-07-21 drh: write_file_indented t3 { 81122988ba 2009-03-21 drh: abcd 81122988ba 2009-03-21 drh: efgh 81122988ba 2009-03-21 drh: ijkl 81122988ba 2009-03-21 drh: mnop 3 81122988ba 2009-03-21 drh: qrst 3 81122988ba 2009-03-21 drh: uvwx 3 81122988ba 2009-03-21 drh: yzAB 3 81122988ba 2009-03-21 drh: CDEF 81122988ba 2009-03-21 drh: GHIJ 81122988ba 2009-03-21 drh: KLMN 81122988ba 2009-03-21 drh: OPQR 81122988ba 2009-03-21 drh: STUV 81122988ba 2009-03-21 drh: XYZ. dbda8d6ce9 2007-07-21 drh: } 81122988ba 2009-03-21 drh: write_file_indented t23 { 81122988ba 2009-03-21 drh: abcd 81122988ba 2009-03-21 drh: efgh 2 81122988ba 2009-03-21 drh: ijkl 2 81122988ba 2009-03-21 drh: >>>>>>> BEGIN MERGE CONFLICT 81122988ba 2009-03-21 drh: mnop 81122988ba 2009-03-21 drh: qrst 81122988ba 2009-03-21 drh: uvwx 81122988ba 2009-03-21 drh: yzAB 2 81122988ba 2009-03-21 drh: CDEF 2 81122988ba 2009-03-21 drh: GHIJ 2 81122988ba 2009-03-21 drh: ============================ 81122988ba 2009-03-21 drh: mnop 3 81122988ba 2009-03-21 drh: qrst 3 81122988ba 2009-03-21 drh: uvwx 3 81122988ba 2009-03-21 drh: yzAB 3 81122988ba 2009-03-21 drh: CDEF 81122988ba 2009-03-21 drh: GHIJ 81122988ba 2009-03-21 drh: <<<<<<< END MERGE CONFLICT 81122988ba 2009-03-21 drh: KLMN 81122988ba 2009-03-21 drh: OPQR 81122988ba 2009-03-21 drh: STUV 81122988ba 2009-03-21 drh: XYZ. dbda8d6ce9 2007-07-21 drh: } 81122988ba 2009-03-21 drh: fossil test-3 t1 t2 t3 a23 81122988ba 2009-03-21 drh: test merge1-7.2 {[same_file t23 a23]}
File Annotation