view .gitattributes @ 147:1ccf269e73e8

remove merge mark
author anatofuz
date Sun, 01 Mar 2020 16:36:00 +0900
parents 1830386684a0
children
line wrap: on
line source

# Add indent-with-non-tab to the default git whitespace warnings.
# Note that this file doesn't support bash-style brace expansion.

*.[cCh] whitespace=indent-with-non-tab,space-before-tab,trailing-space
*.cc whitespace=indent-with-non-tab,space-before-tab,trailing-space
ChangeLog whitespace=indent-with-non-tab,space-before-tab,trailing-space
# Make diff on MD files use "(define" as a function marker.
# Use together with git config diff.md.xfuncname '^\(define.*$'
# which is run by contrib/gcc-git-customization.sh too.
*.md diff=md