Artifact 35d77c12e46ef954601d97cb0795889dc812d74e:

• File src/merge.c — part of check-in [fd8698c8e0] at 2010-12-14 15:44:29 on branch trunk — Simplifications to the merge and update logic. Fix update so that it correctly carries file edits across name changes. (user: drh size: 14443)

A hex dump of this file is not available. Please download the raw binary file and generate a hex dump yourself.