Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-08-30 14:56:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Update .gitattributes

Browse source 
refactoring codes
This commit is contained in:
DecorativeFamily 2024-11-07 18:22:12 +03:30 committed by GitHub
parent a72305ce56
commit 7bcc5ab30b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
v2rayN/.gitattributes vendored
View file

@ -5,22 +5,19 @@
############################################################################### ###############################################################################
# Set default behavior for command prompt diff. # Set default behavior for command prompt diff.
# # This is needed for earlier builds of msysgit that do not have it on by
# This is need for earlier builds of msysgit that does not have it on by # default for C# files. Note: This is only used by command line.
# default for csharp files.
# Note: This is only used by command line
############################################################################### ###############################################################################
#*.cs diff=csharp #*.cs diff=csharp
############################################################################### ###############################################################################
# Set the merge driver for project and solution files # Set the merge driver for project and solution files.
#
# Merging from the command prompt will add diff markers to the files if there # 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 # 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 # 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 # 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 # these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below # intervention with every merge. To do so, just uncomment the entries below.
############################################################################### ###############################################################################
#*.sln merge=binary #*.sln merge=binary
#*.csproj merge=binary #*.csproj merge=binary
@ -36,17 +33,15 @@
#*.wwaproj merge=binary #*.wwaproj merge=binary
############################################################################### ###############################################################################
# behavior for image files # Behavior for image files.
# # Image files are treated as binary by default.
# image files are treated as binary by default.
############################################################################### ###############################################################################
#*.jpg binary #*.jpg binary
#*.png binary #*.png binary
#*.gif binary #*.gif binary
############################################################################### ###############################################################################
# diff behavior for common document formats # Diff behavior for common document formats.
#
# Convert binary document formats to text before diffing them. This feature # Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the # is only available from the command line. Turn it on by uncommenting the
# entries below. # entries below.