diff options
| author |  Thomas Gummerer <t.gummerer@gmail.com> | 2018-08-28 23:05:50 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-08-29 11:27:31 -0700 |
| commit | b9b07efdb2ac35684d3ee3fe98f91691d5b8642a (patch) | |
| tree | ca2a6d7e8f5c5f17098c9a2c4f4b5adcb464d1bd | |
| parent | Git 2.18 (diff) | |
| download | tgif-b9b07efdb2ac35684d3ee3fe98f91691d5b8642a.tar.xz | |
.gitattributes: add conflict-marker-size for relevant files
Some files in git.git contain lines that look like conflict markers,
either in examples or tests, or in the case of Documentation/gitk.txt
because of the asciidoc heading.
Having conflict markers the same length as the actual content can be
confusing for humans, and is impossible to handle for tools like 'git
rerere'. Work around that by setting the 'conflict-marker-size'
attribute for those files to 32, which makes the conflict markers
unambiguous.
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | .gitattributes | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 1bdc91e282..49b3051641 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,3 +9,7 @@ /command-list.txt eol=lf /GIT-VERSION-GEN eol=lf /mergetools/* eol=lf +/Documentation/git-merge.txt conflict-marker-size=32 +/Documentation/gitk.txt conflict-marker-size=32 +/Documentation/user-manual.txt conflict-marker-size=32 +/t/t????-*.sh conflict-marker-size=32 |