1 
# To enable automatic merging of ChangeLog files, use the following command:
2 
# git config merge.changelog.driver "resolve-ChangeLogs --merge-driver %O %A %B"
3 
ChangeLog* merge=changelog
4 





5

# To enable smart diffing of ObjC[++] files, run the following commands:





6

# git config diff.objcpp.xfuncname "^[-+@a-zA-Z_].*$"





7

# git config diff.objcppheader.xfuncname "^[@a-zA-Z_].*$"





8

*.m diff=objc





9

*.mm diff=objcpp





10

mac/*.h diff=objcppheader





11

*/mac/*.h diff=objcppheader





12

*/*/mac/*.h diff=objcppheader





13

objc/*.h diff=objcppheader





14

*/objc/*.h diff=objcppheader





15

*/*/objc/*.h diff=objcppheader





16






17

*.vcproj eol=crlf





18

*.vsprops eol=crlf





19

*.sln eol=crlf





20






21

# For best performance, place rules for deep paths in the parent directory.





22

# For example: instead of "Source/WebCore/inspector/Inspector.json -crlf" here,





23

# place "Inspector.json -crlf" in Source/WebCore/inspector/.gitattributes