Fossil

Timeline
Login

Timeline

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

5 check-ins using file src/merge3.c version a494baf01b

2010-12-16
14:46
Use relative URLs for hyperlinks whereever possible, so that Fossil can work better behind a reverse proxy. ... (check-in: daeb10f65f user: drh tags: trunk)
2010-12-15
02:42
Fix an uninitialized variable in update. ... (check-in: e3313965d3 user: drh tags: trunk)
02:19
Make three new TH1 variables available the footer on /doc pages: $doc_name, $doc_version, and $doc_date. ... (check-in: 1b0e6c0fbb user: drh tags: trunk)
01:49
Report the number of conflicts at the end of a merge or update and offer a hint to the user about the "fossil undo" command. ... (check-in: 070ce24d83 user: drh tags: trunk)
01:36
Change the merge conflict marks to identify which part is original content and which part is the content merged in. ... (check-in: 76ae862ec9 user: drh tags: trunk)