Overview
| Comment: | merge: --integrate, --baseline, -n, and a bare merge onto the one other leaf (zit#164)
The checkout record carries the integrated leaf's hash as an optional sixth field; commit closes it with the same control artifact branch close mints. |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
2a522aab4066943892b4f17c800b2dbd |
| User & Date: | dmestas on 2026-08-29 07:35:42.816 |
| Other Links: | manifest | tags |
Context
|
2026-08-29
| ||
| 07:53 |
stash: snapshot, diff, goto, and apply --merge (zit#164)
--merge three-way merges a stashed change into a dirty file; conflicts get markers, are listed, and exit 5 with the entry kept. check-in: 21ce2c785d user: dmestas tags: trunk | |
| 07:35 |
merge: --integrate, --baseline, -n, and a bare merge onto the one other leaf (zit#164)
The checkout record carries the integrated leaf's hash as an optional sixth field; commit closes it with the same control artifact branch close mints. check-in: 2a522aab40 user: dmestas tags: trunk | |
| 07:01 |
diff: PATH operands, --numstat, --invert, --checkin, --branch (zit#164)
-Z is -w; -N is accepted (an added file's hunks already carry it all). check-in: 39c88046ab user: dmestas tags: trunk | |
Changes
Modified src/checkout.zig
from [c4a5353257]
to [56d0e2a370].
[diff]
Modified src/cli.zig
from [74695c3dda]
to [9d72682682].
[diff]
Modified src/cmd/checkout.zig
from [6f97e4637f]
to [1b45f089c3].
[diff]
Modified src/e2e.zig
from [ef961f46f1]
to [2c8fc6d917].
[diff]
Modified src/main.zig
from [2a172ca320]
to [d709cd84ae].
[diff]
Modified src/undo.zig
from [94d48d0062]
to [354e561b4e].
[diff]
Modified www/reference.html
from [eaf304f6a8]
to [6e17adf807].
[diff]