Overview
| Comment: | A conflicting landing shows its merge in three panes, ours, the result and theirs, from zit's merge report, and stacked conflicts on a phone |
|---|---|
| Timelines: | family | ancestors | descendants | both | meld-view |
| Files: | files | file ages | folders |
| SHA3-256: |
2c07c824eadd0a807bb05a042c21dd74 |
| User & Date: | zeitgeist on 2026-10-07 18:13:08.780 |
| Other Links: | branch diff | manifest | tags |
Context
|
2026-10-07
| ||
| 19:42 | land meld-view check-in: ee70c9c3a5 user: dmestas tags: trunk | |
| 18:13 | A conflicting landing shows its merge in three panes, ours, the result and theirs, from zit's merge report, and stacked conflicts on a phone closed check-in: 2c07c824ea user: zeitgeist tags: meld-view | |
| 17:12 | land local-ticket-search check-in: 656ba9ddc5 user: dmestas tags: trunk | |
Changes
Modified docs/api.md
from [ddb5cd6b4c]
to [6acdf7802b].
[diff]
Added internal/api/landingconflicts.go version [815d37098b].
Added internal/api/landingconflicts_test.go version [3dd8e64d59].
Modified internal/api/register.go
from [ad19b04fb8]
to [caf7899738].
[diff]
Added internal/web/assets/meld.js version [c50e9b0e77].
Added internal/web/meld.go version [0be4705c2c].
Added internal/web/meld_test.go version [c86ded4a94].
Modified internal/web/palette_test.go
from [f1714ee015]
to [b391b545c4].
[diff]
Modified internal/web/stylesheet.go
from [ac8ee6ba70]
to [6b4629ec5e].
[diff]
Modified internal/web/web.go
from [8a2d49039d]
to [f0250e68ae].
[diff]
Modified internal/zitcli/leasetoken_test.go
from [49f7fe04a9]
to [9e34778952].
[diff]
Added internal/zitcli/mergeregions.go version [1bc66708ff].
Added internal/zitcli/mergeregions_test.go version [f11d6e67e2].
Modified internal/zitcli/operand.go
from [378f191c2b]
to [31dfd21738].
[diff]
Modified internal/zitcli/zitcli.go
from [05e062209b]
to [059a1972fe].
[diff]