Timeline
Not logged in

22 events by user drh occurring around 2009-03-20 01:26:14.

2009-03-21
19:18:22 * [81122988ba] More improvements to the 3-way merge. Additional test cases added. (user: drh, tags: trunk)
16:35:20 * Closed ticket d67855cceb: css files served as application/x-fossil-artifact not text/css plus 2 other changes (user: drh)
16:31:19 * Fixed ticket f90265fc83: branches plus 1 other change (user: drh)
16:25:37 * Fixed ticket 98b63bd316: 3-way merge drops line plus 2 other changes (user: drh)
16:24:43 * Fixed ticket 5037536050: Confusing conflict markers plus 2 other changes (user: drh)
16:22:51 * Fixed ticket fe5b460867: Typo in "anonymous" user name on instructions on Edit User page plus 2 other changes (user: drh)
16:21:43 * [5ab6f985b9] Fix a typo in a hard-coded web page. Ticket fe5b460867a187cd32a12e04db62392871c4c38b (user: drh, tags: trunk)
14:12:29 * [83566f2424] More improvements to the 3-way merge algorithm. (user: drh, tags: trunk)
2009-03-20
23:26:11 * Ticket 98b63bd316 3-way merge drops line status still Open with 1 other change (user: drh)

01:26:14 * [434830cc00] Turn off the debugging prints that were left on by mistake in the previous check-in. (user: drh, tags: trunk)

01:23:53 * [e45d478f0c] Improve merge conflict markings. (user: drh, tags: trunk)
2009-03-13
03:22:58 * Ticket 7757af0d54 Store rights and owners status still Open with 2 other changes (user: drh)
2009-02-26
01:21:04 * [f6790b7c3c] Fix a memory leak that was preventing massive check-ins. (user: drh, tags: trunk)
2009-02-21
13:09:40 * [6ba52ae761] Documentation tweaks. No changes to code. (user: drh, tags: trunk)
2009-02-16
12:55:35 * Ticket 5a13dbd275 add and ci/commit are inconsistent wrt "*" handling status still Open with 2 other changes (user: drh)
2009-02-01
12:23:53 * [daacc139a5] Always report the content-type charset as utf-8. Ticket cc6557cfc5763fa80bb04eecea7f713b0751efc4 (user: drh, tags: trunk)
12:12:51 * Closed ticket 5b871546ce: Possible typo in file src/main.c, introduced by check-in b2e55c0d4d plus 2 other changes (user: drh)
2009-01-30
02:26:57 * [23e96cf795] Fix errors in the mimetype-generator table for documentation files. (user: drh, tags: trunk)
2009-01-29
23:04:47 * [24c045f373] Merge Merge in kkinnell's documentation updates. (user: drh, tags: trunk)
03:36:00 * [29900f98f6] Print the current status (including the current branch) after moving to the end branch in the "open" command. (user: drh, tags: trunk)