Overview
| Comment: | fix(merge): IsText converts as fossil's text_diff does
Read data through the ported BOM/UTF-16 conversion and line splitter, so the Update gate and the merge agree on what is text. Tracked in #447 |
|---|---|
| Timelines: | family | ancestors | descendants | both | main | trunk | feat/submanifest-reader |
| Files: | files | file ages | folders |
| SHA3-256: |
eb1791acd5ae85b14e89075a59556203 |
| User & Date: | [email protected] on 2026-10-19 01:52:19.000 |
| Other Links: | branch diff | manifest | tags |
Context
|
2026-10-19
| ||
| 12:46 |
Merge branch 'fix/merge3-markers' into feat/submanifest-reader
# Conflicts: # CHANGELOG.md check-in: 2a0701c7d3 user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 01:52 |
fix(merge): IsText converts as fossil's text_diff does
Read data through the ported BOM/UTF-16 conversion and line splitter, so the Update gate and the merge agree on what is text. Tracked in #447 check-in: eb1791acd5 user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 01:50 | Merge remote-tracking branch 'origin/main' into fix/merge3-markers check-in: 4f1f98b70d user: [email protected] tags: feat/submanifest-reader, main, trunk | |
Changes
Modified internal/merge/text.go
from [1a2a0d0154]
to [2925f46861].
[diff]
Modified internal/merge/text_test.go
from [e7418d115a]
to [9cfa1121e7].
[diff]