Timeline
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

1 check-in using file src/merge.c version 35d77c12e4

2010-12-14
15:44
Simplifications to the merge and update logic. Fix update so that it correctly carries file edits across name changes. check-in: fd8698c8e0 user: drh tags: trunk