File tree Expand file tree Collapse file tree 1 file changed +28
-5
lines changed
Expand file tree Collapse file tree 1 file changed +28
-5
lines changed Original file line number Diff line number Diff line change 11# ##############################################################################
22# Set default behavior to automatically normalize line endings.
33# ##############################################################################
4- * text =auto
4+ * text =lf
5+
6+ # Check out the following as ln always for osx/linux/cygwin
7+ * .sh text eol =lf
8+
9+ # Windows specific files should always be crlf on checkout
10+ * .bat text eol =crlf
11+ * .cmd text eol =crlf
12+ * .ps1 text eol =crlf
513
614# ##############################################################################
715# Set default behavior for command prompt diff.
1018# default for csharp files.
1119# Note: This is only used by command line
1220# ##############################################################################
13- # *.cs diff=csharp
21+ * .config text
22+ * .cs text diff =csharp
23+ * .csproj text
24+ * .md text
25+ * .msbuild text
26+ * .nuspec text
27+ * .pp text
28+ * .ps1 text
29+ * .sln text
30+ * .tt text
31+ * .txt text
32+ * .xaml text
33+ * .xml text
1434
1535# ##############################################################################
1636# Set the merge driver for project and solution files
4060#
4161# image files are treated as binary by default.
4262# ##############################################################################
43- # *.jpg binary
44- # *.png binary
45- # *.gif binary
63+ * .bmp binary
64+ * .jpeg binary
65+ * .jpg binary
66+ * .nupkg binary
67+ * .png binary
68+ * .sdf binary
4669
4770# ##############################################################################
4871# diff behavior for common document formats
You can’t perform that action at this time.
0 commit comments