Overview
| Comment: | Merge branch 'fix/merge3-markers' into feat/submanifest-reader
# Conflicts: # CHANGELOG.md |
|---|---|
| Timelines: | family | ancestors | descendants | both | main | trunk | feat/submanifest-reader |
| Files: | files | file ages | folders |
| SHA3-256: |
2a0701c7d38f741cd075ea055721d28c |
| User & Date: | [email protected] on 2026-10-19 12:46:37.000 |
| Other Links: | branch diff | manifest | tags |
Context
|
2026-10-19
| ||
| 12:47 |
Merge branch 'fix/stash-undo-storage' into feat/submanifest-reader
# Conflicts: # CHANGELOG.md # internal/checkout/vfile.go check-in: 189088f46c user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 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 | |
| 12:46 | Merge branch 'fix/tag-events' into feat/submanifest-reader check-in: e9e08cbb58 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 | |
Changes
Modified CHANGELOG.md
from [429cebc6ff]
to [81d352d12a].
[diff]
Modified internal/merge/doc.go
from [42df37cabd]
to [6a3c469f89].
[diff]
Added internal/merge/fossildiff.go version [bc5bb4f880].
Added internal/merge/fossillcs.go version [c4ac114be4].
Modified internal/merge/marker.go
from [4f967b7970]
to [49ac641a9b].
[diff]
Added internal/merge/merge3.go version [62b433035b].
Added internal/merge/merge3_fossil_test.go version [3c764ca673].
Modified internal/merge/text.go
from [1a2a0d0154]
to [2925f46861].
[diff]
Modified internal/merge/text_test.go
from [e7418d115a]
to [9cfa1121e7].
[diff]
Modified internal/merge/threeway.go
from [98d02406da]
to [e7c1014e0b].
[diff]
Modified internal/merge/threeway_test.go
from [3fd83d8547]
to [f0679bd2fc].
[diff]
Added internal/merge/utf.go version [df22311708].