15 lines
389 B
Plaintext
15 lines
389 B
Plaintext
|
|
############################################################
|
|
# DO NOT EDIT THIS FILE - the content may be overwritten
|
|
# Version: 1.0.0.0
|
|
############################################################
|
|
|
|
|
|
|
|
# not try to merge files when they have conflicts, but rather use our side of the merge over others.
|
|
* merge=ours
|
|
|
|
# tread these files as binaries
|
|
*.meta -text -diff
|
|
*.object -text -diff
|