branch: elpa/git-commit
commit 45be64e5f1ef0d03156c53543eb198829177a934
Author: Eugene Mikhaylov <lewwa...@gmail.com>
Commit: Jonas Bernoulli <jo...@bernoul.li>
manual: Fix miscount and add comma
---
docs/magit.org | 6 +++---
docs/magit.texi | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/magit.org b/docs/magit.org
index 0d1a4f6f21..ab58ce7225 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -5548,9 +5548,9 @@ If a file has conflicts and Git cannot resolve them by
itself, then it
puts both versions into the affected file along with special markers
whose purpose is to denote the boundaries of the unresolved part of
the file and between the different versions. These boundary lines
-begin with the strings consisting of six times the same character, one
-of ~<~, ~|~, ~=~ and ~>~ and are followed by information about the source of
-the respective versions, e.g.:
+begin with the strings consisting of seven times the same character,
+one of ~<~, ~|~, ~=~ and ~>~, and are followed by information about the source
+of the respective versions, e.g.:
#+begin_example
<<<<<<< HEAD
diff --git a/docs/magit.texi b/docs/magit.texi
index 01725d838b..26232d5f36 100644
--- a/docs/magit.texi
+++ b/docs/magit.texi
@@ -6831,9 +6831,9 @@ If a file has conflicts and Git cannot resolve them by
itself, then it
puts both versions into the affected file along with special markers
whose purpose is to denote the boundaries of the unresolved part of
the file and between the different versions. These boundary lines
-begin with the strings consisting of six times the same character, one
-of @code{<}, @code{|}, @code{=} and @code{>} and are followed by information
about the source of
-the respective versions, e.g.:
+begin with the strings consisting of seven times the same character,
+one of @code{<}, @code{|}, @code{=} and @code{>}, and are followed by
information about the source
+of the respective versions, e.g.:
@example
<<<<<<< HEAD
