Timeline
Not logged in

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

15 check-ins using file src/main.c version c2e4729e31

2009-03-22
13:18
Add many new test cases for 3-way merge. No new problems found. check-in: 92638367d8 user: drh tags: trunk
12:25
Fix a bug in error recovery logic in the 3-way merge. Added new comments to the 3-way merge code to hopefully make it easier to understand. check-in: 3e89b0c526 user: drh tags: trunk
2009-03-21
19:44
Additional 3-way-merge test cases. check-in: 26ab4f7012 user: drh tags: trunk
19:18
More improvements to the 3-way merge. Additional test cases added. check-in: 81122988ba user: drh tags: trunk
16:21
Fix a typo in a hard-coded web page. Ticket [fe5b460867a187cd32a12e04db62392871c4c38b] check-in: 5ab6f985b9 user: drh tags: trunk
14:12
More improvements to the 3-way merge algorithm. check-in: 83566f2424 user: drh tags: trunk
2009-03-20
01:26
Turn off the debugging prints that were left on by mistake in the previous check-in. check-in: 434830cc00 user: drh tags: trunk
01:23
Improve merge conflict markings. check-in: e45d478f0c user: drh tags: trunk
2009-02-26
01:21
Fix a memory leak that was preventing massive check-ins. check-in: f6790b7c3c user: drh tags: trunk
2009-02-21
18:59
Undo inadvertant hacking changes in previous ci (should have been documentation only) check-in: c5f4ec0ed5 user: bharder tags: trunk
18:52
typo fix check-in: 5b29f6f65f user: bharder tags: trunk
13:09
Documentation tweaks. No changes to code. check-in: 6ba52ae761 user: drh tags: trunk
2009-02-13
20:30
Doc update for branch and co. check-in: bc857ecd92 user: kejoki tags: trunk
2009-02-11
05:00
Make command-alias for 'checkout': co. This command could -not- have been used previously as a shortcut, as it would be ambiguous becuase of 'commit' and 'configuration'. A natural mate for 'ci'. check-in: a89b436bc9 user: bharder tags: trunk
2009-02-09
18:09
fix option/argument parsing for the case where an option is missing a required argument. check-in: f80303ac73 user: bharder tags: trunk