Overview
| Comment: | land merge-page-cheap |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
b830e3bb280580f4688820531cda07b4 |
| User & Date: | dmestas on 2026-11-16 17:06:10.945 |
| Other Links: | manifest | tags |
Context
|
2026-11-16
| ||
| 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 | |
| 16:59 | A repeat visit to the merge page is cheap, and a mirror opens it on the pickers closed check-in: 11b13ab5d9 user: dmestas tags: merge-page-cheap | |
| 12:38 | land fossil-native-sync check-in: 4b28a29073 user: dmestas tags: trunk | |
Changes
Modified docs/api.md
from [7cb59d2360]
to [908d1e9616].
[diff]
Modified internal/api/landingconflicts.go
from [388ae009bd]
to [3aca150e81].
[diff]
Modified internal/api/mergepair.go
from [6c40774901]
to [1dc19394d9].
[diff]
Added internal/api/mergepairbound_test.go version [511f6e6731].
Added internal/index/branchtipmemo_test.go version [73dbd98928].
Modified internal/index/index.go
from [aa81d3b314]
to [4da5665282].
[diff]
Modified internal/index/landing.go
from [a156d20533]
to [25ca711e56].
[diff]
Added internal/index/mergepair_bench_test.go version [c61bbdc2e7].
Modified internal/web/meld.go
from [cb694370a8]
to [1c4c35d4e5].
[diff]
Modified internal/web/meldcap_test.go
from [53e3425005]
to [45f8fb05a3].
[diff]
Modified internal/web/mergepage.go
from [fb1a048422]
to [958a66d22f].
[diff]
Added internal/web/mergepage_bench_test.go version [7af047d16c].
Added internal/web/mergepage_cheap_test.go version [ec15b848ff].
Modified internal/web/robots_test.go
from [b7ee192bbf]
to [3ee1db84f3].
[diff]
Modified internal/web/web.go
from [699524a6aa]
to [4aa4e73da8].
[diff]
Added internal/zitcli/mergebasememo_test.go version [0beb7a1f71].
Modified internal/zitcli/zitcli.go
from [f80ce04527]
to [49bcb7654a].
[diff]