File tree 1 file changed +4
-4
lines changed
1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change 10
10
# default for csharp files.
11
11
# Note: This is only used by command line
12
12
# ##############################################################################
13
- # *.cs diff=csharp
13
+ * .cs diff =csharp
14
14
15
15
# ##############################################################################
16
16
# Set the merge driver for project and solution files
17
17
#
18
18
# Merging from the command prompt will add diff markers to the files if there
19
19
# are conflicts (Merging from VS is not affected by the settings below, in VS
20
- # the diff markers are never inserted). Diff markers may cause the following
20
+ # the diff markers are never inserted). Diff markers may cause the following
21
21
# file extensions to fail to load in VS. An alternative would be to treat
22
22
# these files as binary and thus will always conflict and require user
23
23
# intervention with every merge. To do so, just uncomment the entries below
46
46
47
47
# ##############################################################################
48
48
# diff behavior for common document formats
49
- #
49
+ #
50
50
# Convert binary document formats to text before diffing them. This feature
51
- # is only available from the command line. Turn it on by uncommenting the
51
+ # is only available from the command line. Turn it on by uncommenting the
52
52
# entries below.
53
53
# ##############################################################################
54
54
# *.doc diff=astextplain
You can’t perform that action at this time.
0 commit comments