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: 20827)
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: 20827)
2012-11-07 09:43:25
— part of check-in
[2f7ac60f78]
on branch improve_commit_warning
— merge trunk.
<p>simplify utf-8 continuation byte checking, using a loop in stead of separater 2/3/4-byte versions.
(user:
jan.nijtmans
size: 20827)