diff options
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 4a9e869f02..9fa72ad450 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,8 +5,12 @@ *.pl eof=lf diff=perl *.pm eol=lf diff=perl *.py eol=lf diff=python -/Documentation/git-*.txt eol=lf +/Documentation/**/*.txt eol=lf /command-list.txt eol=lf /GIT-VERSION-GEN eol=lf /mergetools/* eol=lf /t/oid-info/* 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 |