Overview
| Comment: | One store-level merge produces the merged tree, modes included; merge --probe, the chained probe and landing call it |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
c61f1fc9ff8b5f5a10b4b6df50751a3e |
| User & Date: | dmestas on 2026-09-28 23:13:53.043 |
| Other Links: | manifest | tags |
Context
|
2026-09-28
| ||
| 23:31 | zit merge-tree: write the tree a merge would produce, as files or a tar, without a checkout or store writes check-in: 5471e96902 user: dmestas tags: trunk | |
| 23:13 | One store-level merge produces the merged tree, modes included; merge --probe, the chained probe and landing call it check-in: c61f1fc9ff user: dmestas tags: trunk | |
| 22:55 | merge takes a mode the other side alone changed, as Fossil does; an overwrite applies the mode check-in: 8dba50836f user: dmestas tags: trunk | |
Changes
Modified src/cmd/checkout.zig
from [ca406f0517]
to [5141c20bb2].
[diff]