various fixes#10568

Merged

Byron merged 2 commits intomasterfrom

Oct 7, 2025

Commits on Oct 7, 2025

Make sure we can find a project even if the CWD is inside a subdirectory
Byron
committed
Upgrade `gix` to fix blob merges that wouldn't detect their conflicts.
Byron
committed