megamerge

reflow: Preserve comment prefixes during hard-wrap

docs: Add changelog entry for the filetree panel

conflicts: highlight both sides as "added" in side-side comparisons

feat: vcs: support Jujutsu as a diff-provider

feat: Diff source caching and autodetection

Labels for macro commands

Refactor rainbow indent guides configuration into being a boolean on/off

build(deps): bump dtolnay/rust-toolchain (#15957)

merge from master