git: d910789bdc - main - Committers guide: Fix block

The branch main has been updated by carlavilla:

URL: https://cgit.FreeBSD.org/doc/commit/?id=d910789bdce14cf3efcea54643aef183a93a7f86

commit d910789bdce14cf3efcea54643aef183a93a7f86
Author:     Vladlen Popolitov <[email protected]>
AuthorDate: 2025-08-12 19:42:03 +0000
Commit:     Sergio Carlavilla Delgado <[email protected]>
CommitDate: 2025-08-12 19:42:03 +0000

    Committers guide: Fix block
    
    Approved by:            bcr@
    Differential Revision:  D51843
---
 documentation/content/en/articles/committers-guide/_index.adoc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc
index 0b23426894..71bb302151 100644
--- a/documentation/content/en/articles/committers-guide/_index.adoc
+++ b/documentation/content/en/articles/committers-guide/_index.adoc
@@ -833,8 +833,10 @@ To abort and get back to the state before "git rebase", run "git rebase --abort"
 Could not apply 646e0f9cda11... no color ls
 ....
 which looks scary.
+
 If you bring up an editor, you will see it is a typical 3-way merge conflict resolution that you may be familiar with from other source code systems (the rest of ls.c has been omitted):
 [source,shell]
+....
  <<<<<<< HEAD
  #ifdef COLORLS_NEW
  #include <terminfo.h>
@@ -844,7 +846,9 @@ If you bring up an editor, you will see it is a typical 3-way merge conflict res
  #include <termcap.h>
  >>>>>>> 646e0f9cda11... no color ls
 ....
+
 The new code is first, and your code is second.
+
 The right fix here is to just add a #undef COLORLS_NEW before #ifdef and then delete the old changes:
 [source,shell]
 ....
@@ -853,6 +857,7 @@ The right fix here is to just add a #undef COLORLS_NEW before #ifdef and then de
 #include <terminfo.h>
 ....
 save the file.
+
 The rebase was interrupted, so you have to complete it:
 [source,shell]
 ....