Artifact 61efa8a3332cc4df4b9fec485e9affc6b244f851:
- File src/merge3.c — part of check-in [3e89b0c526] at 2009-03-22 12:25:59 on branch trunk — 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. (user: drh size: 11131) [more...]
A hex dump of this file is not available. Please download the raw binary file and generate a hex dump yourself.