-
Douwe Maan authored
Fix conflict highlighting See merge request gitlab-org/gitlab-ce!15463 (cherry picked from commit 202ab62874bb3d828ab48017550660d461e8cf6b) 64a9e53b Fix conflict highlighting
370cbbdf8713
Fix conflict highlighting See merge request gitlab-org/gitlab-ce!15463 (cherry picked from commit 202ab62874bb3d828ab48017550660d461e8cf6b) 64a9e53b Fix conflict highlighting