| OLD | NEW |
| 1 # For best performance, place rules for deep paths in the parent directory. | 1 # For best performance, place rules for deep paths in the parent directory. |
| 2 # For example: instead of "Source/WebCore/inspector/Inspector.json -crlf" here, | 2 # For example: instead of "Source/WebCore/inspector/Inspector.json -crlf" here, |
| 3 # place "Inspector.json -crlf" in Source/WebCore/inspector/.gitattributes | 3 # place "Inspector.json -crlf" in Source/WebCore/inspector/.gitattributes |
| 4 | 4 |
| 5 # Exclude these git specific files from archives created via git-archive. | |
| 6 .gitignore export-ignore | |
| 7 .gitattributes export-ignore | |
| 8 | |
| 9 # TODO(thakis): Remove this after a while. | 5 # TODO(thakis): Remove this after a while. |
| 10 *.cpp merge=clang-format | 6 *.cpp merge=clang-format |
| 11 *.h merge=clang-format | 7 *.h merge=clang-format |
| 12 *.mm merge=clang-format | 8 *.mm merge=clang-format |
| OLD | NEW |