Overview
| Comment: | merge-tree: test a store missing one side's content, reported unreadable and refused by --commit |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
8b9da419b21836dd84d5ef03dac8fb24 |
| User & Date: | dmestas on 2026-10-06 20:44:38.588 |
| Other Links: | manifest | tags |
Context
|
2026-10-06
| ||
| 21:17 | Release 0.3.39 check-in: 938da971fb user: dmestas tags: trunk, version-0.3.39 | |
| 20:44 | merge-tree: test a store missing one side's content, reported unreadable and refused by --commit check-in: 8b9da419b2 user: dmestas tags: trunk | |
| 19:47 | merge-tree: -F json reports a conflicting merge file by file and region by region; --commit records the merge with resolutions supplied by the caller check-in: 0a0e119374 user: dmestas tags: trunk | |
Changes
Modified src/e2e.zig
from [109514d6c4]
to [6c00ef72db].
[diff]