a | b/.gitattributes | ||
---|---|---|---|
1 | |||
2 | ############################################################ |
||
3 | # DO NOT EDIT THIS FILE - the content may be overwritten |
||
4 | # Version: 1.0.0.0 |
||
5 | ############################################################ |
||
6 | |||
7 | |||
8 | |||
9 | # not try to merge files when they have conflicts, but rather use our side of the merge over others. |
||
10 | * merge=ours |
||
11 | |||
12 | # tread these files as binaries |
||
13 | *.meta -text -diff |
||
14 | *.object -text -diff |