Overview
| SHA1 Hash: | 3e89b0c52648512790ae4c02101e2a25c520a502 |
|---|---|
| Date: | 2009-03-22 12:25:59 |
| User: | drh |
| Comment: | Fix a bug in error recovery logic in the 3-way merge. Added new comments to the 3-way merge code to hopefully make it easier to understand. |
| 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/merge3.c from [137ba3bf55] to [61efa8a333]. [diff]