Overview
| Comment: | 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 |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
0a0e11937469d872716c6119e9678e17 |
| User & Date: | dmestas on 2026-10-06 19:47:57.424 |
| Other Links: | manifest | tags |
Context
|
2026-10-06
| ||
| 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 | |
|
2026-10-05
| ||
| 23:38 | release workflow: clear the macOS package directory before extracting into it check-in: 24836c1902 user: dmestas tags: trunk | |
Changes
Modified src/cli.zig
from [4ffa9aa56c]
to [bb7f776b28].
[diff]
Modified src/cmd/checkout.zig
from [5141c20bb2]
to [902087d9b7].
[diff]
Modified src/cmd/landing.zig
from [fca60ef344]
to [f7f026a6ed].
[diff]
Modified src/cmd/mergetree.zig
from [caa97f02f9]
to [d00ce91352].
[diff]
Modified src/cmd/stash.zig
from [1d8db4ddd9]
to [9e8e9eb38f].
[diff]
Modified src/e2e.zig
from [d35799ed7b]
to [109514d6c4].
[diff]
Modified src/main.zig
from [873febe4b2]
to [59c26be877].
[diff]
Modified src/merge3.zig
from [55257c3063]
to [f064cb40fe].
[diff]
Modified src/merge3_fuzz.zig
from [53ac948c41]
to [651177c844].
[diff]
Modified www/reference.html
from [f4dae607a9]
to [2b0813d733].
[diff]