Conrad Irwin 0a70627f00 Split conflicts into their own section (#24324) ... Co-Authored-By: Mikayla <mikayla@zed.dev> Release Notes: - N/A		2025-02-05 18:34:14 -07:00
..
src	Split conflicts into their own section (#24324)	2025-02-05 18:34:14 -07:00
test_data	Store goldenfiles with trailing newline (#10900)	2024-04-23 19:13:04 +02:00
Cargo.toml	Fix unnecessarily large edits emitted from multi buffer on diff recalculation (#23753)	2025-01-27 18:11:15 -08:00
LICENSE-GPL	chore: Change AGPL-licensed crates to GPL (except for collab) (#4231)	2024-01-24 00:26:58 +01:00