Split conflicts into their own section (#24324)
Co-Authored-By: Mikayla <mikayla@zed.dev> Release Notes: - N/A
C
Conrad Irwin committed
0a70627f005a1b070dbe495ffd9ea0e4a3817da1
Parent: 5d1c568
Committed by GitHub <noreply@github.com>
on 2/6/2025, 1:34:14 AM