From c43096ba96c8cdb51084b25eb5f71e5690fa74c1 Mon Sep 17 00:00:00 2001
From: Fedor Sheremetyev <sheremetyev@gmail.com>
Date: Fri, 2 Aug 2024 18:05:57 +0100
Subject: [PATCH] docs: Fix example with Git conflicts markers

---
 docs/conflicts.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/conflicts.md b/docs/conflicts.md
index 9f22265f1..4d0834329 100644
--- a/docs/conflicts.md
+++ b/docs/conflicts.md
@@ -62,15 +62,15 @@ style](https://git-scm.com/docs/git-merge#_how_conflicts_are_presented):
   apple
   grapefruit
   orange
-  ======= base
+  ||||||| base
   apple
   grape
   orange
-  ||||||| right
+  =======
   APPLE
   GRAPE
   ORANGE
-  >>>>>>>
+  >>>>>>> right
 ```
 
 In this example, the left side changed "grape" to "grapefruit", and the right