Timeline
Not logged in

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

6 check-ins using file src/main.c version 4b8d03c99a

2011-02-22
12:18
Fix issues in the graphical merge conflict resolution reported on the mailing list. check-in: 60f0986332 user: drh tags: trunk
2011-02-21
22:26
Added a few more external links to the "Reviews" page. check-in: 184500e46a user: drh tags: trunk
18:20
Factor the code that outputs line-numbered text into a separate subroutine, for clarity of presentation. check-in: a4d57c6b26 user: drh tags: trunk
16:33
Add the ability to use a graphical merging tool to resolve merge conflicts. Even without a configured graphical tool, leave files behind (VCS droppings) that contain the baseline, original, and merged files. check-in: 9b7a6f80b2 user: drh tags: trunk
14:21
Infrastructure changes toward adding graphical merging options. check-in: b9abb86798 user: drh tags: trunk
13:17
Do not assume that the PATH_INFO environment variable is set by CGI. Give it a default value to avoid segfaults (on Solaris). check-in: 88383d8d4a user: drh tags: trunk