Fossil  Timeline

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

2 check-ins by user marciogabe

If both files being merged by 'fossil merge' contain a UTF-8 byte order mark (BOM), keep it in the produced merged file. ... (Closed-Leaf check-in: 91182cd1 user: marciogabe tags: merge-crlf-bom)
Adjust 'fossil merge' command to use CR/LF line endings for conflict markings if both files being merged already use such line ending type. ... (check-in: 60ecf5d9 user: marciogabe tags: merge-crlf-bom)