Conrad IrwinandMikayla cd95fa9e41 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

..

cursor.rs

Move git status out of Entry (#22224)

2025-01-04 01:00:16 +00:00

sum_tree.rs

git: Compute and synchronize diffs from HEAD (#23626)

2025-02-04 15:29:10 -05:00

tree_map.rs

Split conflicts into their own section (#24324)

2025-02-05 18:34:14 -07:00