Artifact 818535fc6ac4660aff615c5c8c0a0d878d306134:
- File
src/update.c
- 2012-11-05 21:10:16 — part of check-in [cd2c0e4cb5] on branch trunk — Do not run the graphical merging tool nor leave merge-droppings after a dry-run merge. Also improve the merge summary message at the end of a merge. (user: drh size: 25653)
- 2012-11-06 09:36:32 — part of check-in [4fa4972104] on branch convert_before_commit — merge trunk<p>Don't try to convert binary files. (user: jan.nijtmans size: 25653)