Lines Matching refs:binary

22 # these files as binary and thus will always conflict and require user
25 #*.sln       merge=binary
26 #*.csproj    merge=binary
27 #*.vbproj    merge=binary
28 #*.vcxproj   merge=binary
29 #*.vcproj    merge=binary
30 #*.dbproj    merge=binary
31 #*.fsproj    merge=binary
32 #*.lsproj    merge=binary
33 #*.wixproj   merge=binary
34 #*.modelproj merge=binary
35 #*.sqlproj   merge=binary
36 #*.wwaproj   merge=binary
41 # image files are treated as binary by default.
43 #*.jpg   binary
44 #*.png   binary
45 #*.gif   binary
50 # Convert binary document formats to text before diffing them. This feature