History of test/merge1.test
|
2009-03-21
| ||
| 19:18:22 | [310813fc4c] 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) [diff] [annotate] | |
|
2007-12-05
| ||
| 08:07:46 | [eed9903dc2] part of check-in [d0305b305a] Merged mainline into my branch to get the newest application. (By: aku on 2007-12-05 08:07:46) [diff] [annotate] | |
|
2007-11-16
| ||
| 20:42:31 | [eed9903dc2] part of check-in [36b96b8616] Rework the merge algorithm. It now only works for text files. But, it no longer gets confused by line endings (\r\n versus \n) and it reports conflicts. (By: drh on 2007-11-16 20:42:31) [diff] [annotate] | |
|
2007-07-21
| ||
| 14:10:57 | [419c5c1aa7] part of check-in [dbda8d6ce9] Initial check-in of m1 sources. (By: drh on 2007-07-21 14:10:57) [annotate] | |