diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-21 16:57:53 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 16:57:53 +0300 |
| commit | 04d70dd64837a088f1e95286e328801085631e82 (patch) | |
| tree | 53eae279181c6d9cce28e2f2b40d51311718a20c | |
| parent | 7532a181895e2560ffe8b631df9add386b84671c (diff) | |
| parent | b9b07efdb2ac35684d3ee3fe98f91691d5b8642a (diff) | |
Merge branch 'tg/conflict-marker-size' into maint
Developer aid.
* tg/conflict-marker-size:
.gitattributes: add conflict-marker-size for relevant files
| -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 |