Artifact c57459855a004b22c03b6a3d76d58f09d3c2b8e63c27aef867e2270c062f3ef6:
- File docs/RELEASE-NOTES-0.3.42.md — part of check-in [c2dd1794b3] at 2026-10-09 03:36:24 on branch trunk — Release 0.3.42 (user: dmestas, size: 891) [annotate] [blame] [check-ins using]
zit 0.3.42
zit 0.3.42 fixes zit merge-tree --commit for the most common clean merge:
one where the two sides changed different files.
No artifact, tag namespace, wire, or on-disk repository format changed.
merge-tree --commit records a merge whose sides share no changed file
0.3.41 taught --commit to record a clean merge, but only when both sides
had changed at least one file in common. When they had not, for example when
a branch added one file and trunk another, it refused with
"cannot scope the working area" and wrote nothing.
Now that merge is recorded too, as the check-in zit merge and zit commit
would make in a checkout. landing accept already handled this case; both
now take it from the same place.
Compatibility
merge-tree --commiton a pair that shares a changed file, clean or conflicting, is unchanged.- No other command's output changed.