Cole Miller 9c7b1d19ce Fix a panic in merge conflict parsing (#32119) ... Release Notes: - Fixed a panic that could occur when editing files containing merge conflicts.		2025-06-04 20:05:26 -04:00
..
conflict_set.rs	Fix a panic in merge conflict parsing (#32119)	2025-06-04 20:05:26 -04:00
git_traversal.rs	Automatically keep edits if they are included in a commit (#32093)	2025-06-04 19:54:24 +02:00