Overview
| Comment: | land meld-both-once |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
4033db056496b4b99742a38457d3da73 |
| User & Date: | dmestas on 2026-11-16 17:57:27.728 |
| Other Links: | manifest | tags |
Context
|
2026-11-16
| ||
| 19:01 | land zit-0149 check-in: 9802670015 user: dmestas tags: trunk | |
| 18:28 | A repository's People settings list agents apart from people check-in: 8153d48031 user: dmestas tags: people-agents-apart | |
| 18:14 | Pin zit 0.14.9 closed check-in: fc7d3ea335 user: dmestas tags: zit-0149 | |
| 17:57 | land meld-both-once check-in: 4033db0564 user: dmestas tags: trunk | |
| 17:32 | Taking both sides of a conflict writes the lines they share once closed check-in: b37cefd9ed user: dmestas tags: meld-both-once | |
| 17:06 | land merge-page-cheap check-in: b830e3bb28 user: dmestas tags: trunk | |
Changes
Modified internal/api/landingresolve_test.go
from [673912b78b]
to [738678ad82].
[diff]
Modified internal/web/assets/meld.js
from [8f50cbdab2]
to [58c164ef4f].
[diff]
Modified internal/web/meld.go
from [1c4c35d4e5]
to [e53e1f2583].
[diff]
Added internal/web/meldnarrow_test.go version [acd43ac86e].
Modified internal/web/mergepage.go
from [958a66d22f]
to [21f6f66d1d].
[diff]
Modified internal/web/web.go
from [4aa4e73da8]
to [b928a2a753].
[diff]