Overview
| SHA1 Hash: | 36b96b861614cd44073a9e33c9d6f91608d03158 |
|---|---|
| Date: | 2007-11-16 20:42:31 |
| User: | drh |
| Comment: | 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. |
| Timelines: | ancestors | descendants | both | trunk |
| Other Links: | files | ZIP archive | manifest |
Tags And Properties
- branch=trunk inherited from [a28c83647d]
- sym-trunk inherited from [a28c83647d]
Changes
[show diffs]Modified src/blob.c from [d66858e82e] to [1da99958db]. [diff]
Modified src/diff.c from [09050dfe39] to [017b424914]. [diff]
Modified src/merge.c from [4db3ee048d] to [5979683d08]. [diff]
Modified src/merge3.c from [2a2187581a] to [b966dfba2b]. [diff]
Modified src/update.c from [abfa21b27a] to [86ce400827]. [diff]
Modified test/merge1.test from [419c5c1aa7] to [eed9903dc2]. [diff]
Modified test/tester.tcl from [8cd24c134d] to [ba01105cd0]. [diff]