[binutils-gdb] [gdb] Fix leftover conflict marker in gdb/config/djgpp/README

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=a2fdf450b0058677356450eb98bd260ac3c648e0

commit a2fdf450b0058677356450eb98bd260ac3c648e0
Author: Tom de Vries <[email protected]>
Date:   Thu Jun 18 22:06:50 2026 +0200

    [gdb] Fix leftover conflict marker in gdb/config/djgpp/README
    
    For gdb/config/djgpp/README, we have:
    ...
    gdb/config/djgpp/README:6: leftover conflict marker
    ...
    
    This is a false positive, this is just some text formatting using '=':
    ...
    General
    =======
    ...
    whose length happens to match the default value of git attribute
    conflict-marker-size: 7.
    
    Fix this by setting the conflict-marker-size to 80.
    
    Approved-By: Tom Tromey <[email protected]>

Diff:
---
 gdb/config/djgpp/.gitattributes            | 3 +++
 gdb/contrib/check-whitespace-pre-commit.py | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/gdb/config/djgpp/.gitattributes b/gdb/config/djgpp/.gitattributes
new file mode 100644
index 00000000000..807fd6d5c56
--- /dev/null
+++ b/gdb/config/djgpp/.gitattributes
@@ -0,0 +1,3 @@
+# -*- conf -*-
+
+README	conflict-marker-size=80
diff --git a/gdb/contrib/check-whitespace-pre-commit.py b/gdb/contrib/check-whitespace-pre-commit.py
index fb4e4b8f537..fbcc1a1ac45 100755
--- a/gdb/contrib/check-whitespace-pre-commit.py
+++ b/gdb/contrib/check-whitespace-pre-commit.py
@@ -36,7 +36,6 @@ todo_list = [
     "gdb/features/sparc/sparc32-fpu.xml",
     "gdb/features/s390-core64.xml",
     "gdb/features/sparc/sparc32-cp0.xml",
-    "gdb/config/djgpp/README",
     "gdb/exc_request.defs",
     "gdb/doc/refcard.tex",
     "gdb/doc/stack_frame.txt",