Fossil

Timeline
Login

Timeline

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

9 check-ins using file src/diff.c version 5006e9fe32

2012-11-06
12:20
gcc warnings: <pre>src/merge3.c: In function ‘merge_3way’: src/merge3.c:445:9: warning: ‘zPivot’ may be used uninitialized in this function src/merge3.c:446:9: warning: ‘zOrig’ may be used uninitialized in this function src/merge3.c:447:9: warning: ‘zOther’ may be used uninitialized in this function </pre> ... (check-in: 233463c4ec user: jan.nijtmans tags: trunk)
09:39
... but revert win/Makefile.mingw (accidently committed) ... (check-in: 8f6cd5f3a3 user: jan.nijtmans tags: convert_before_commit)
09:36
merge trunk<p>Don't try to convert binary files. ... (check-in: 4fa4972104 user: jan.nijtmans tags: convert_before_commit)
08:44
3 minor violations against html5 ... (check-in: c5e08c3fa8 user: jan.nijtmans tags: trunk)
00:49
Add a configuration option that allows timeline comments to be rendered as plain text rather than as wiki. ... (check-in: 90e928deea user: drh tags: trunk)
2012-11-05
21:10
Do not run the graphical merging tool nor leave merge-droppings after a dry-run merge. Also improve the merge summary message at the end of a merge. ... (check-in: cd2c0e4cb5 user: drh tags: trunk)
13:10
If the committed file has CR/NL or UTF-16 (or both), give the user the possibility to convert it to resp NL or UTF-8 (or both) without committing ... (check-in: c6223a8e2a user: jan.nijtmans tags: convert_before_commit)
2012-11-04
17:41
Merge the "spelling" branch into trunk, fixing a huge number of typos, mostly in comments, but occasionally in error messages or help screens. ... (check-in: db0c512767 user: drh tags: trunk)
12:59
Fix typos. ... (Closed-Leaf check-in: 45065c5c28 user: dmitry tags: spelling)