Fossil

Timeline
Login

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

2 check-ins by user marciogabe

2020-08-24
22:57
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: 91182cd1f3 user: marciogabe tags: merge-crlf-bom)
22:45
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: 60ecf5d9ed user: marciogabe tags: merge-crlf-bom)