GitCafe
Docs
Sign in
gitcafe
/
zed
Code
Issues
Pulls
CI
Stacks
Search
Branches
Tags
Code
Issues
Pulls
CI
Stacks
Search
Branches
Tags
More
Star
0
Code
Fix a panic in merge conflict parsing (#32119)
Unverified
Release Notes: - Fixed a panic that could occur when editing files containing merge conflicts.
9c7b1d19ce
Cole Miller committed on 6/5/2025, 12:05:26 AM
· committed by GitHub
parent
3d98811
Files Changed
1 file changed
Line totals unavailable
Ignore whitespace
Unified
Split
crates/project/src/git_store
crates/project/src/git_store
…
conflict_set.rs
conflict_set.rs
…