-
Notifications
You must be signed in to change notification settings - Fork 11
Expand file tree
/
Copy path.gitattributes
More file actions
46 lines (43 loc) · 1.85 KB
/
.gitattributes
File metadata and controls
46 lines (43 loc) · 1.85 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto
###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
*.cs diff=csharp
###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.csproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.modelproj merge=binary
#*.sln merge=binary
#*.sqlproj merge=binary
#*.vbproj merge=binary
#*.vcproj merge=binary
#*.vcxproj merge=binary
#*.wixproj merge=binary
#*.wwaproj merge=binary
###############################################################################
# Behavior for image files
#
# Image files are treated as binary by default.
###############################################################################
*.gif binary
*.ico binary
*.jpg binary
*.png binary