From 7bcc5ab30bc0de888c16f1bf47779b28e6449a61 Mon Sep 17 00:00:00 2001 From: DecorativeFamily <185765765+decorativefamily@users.noreply.github.com> Date: Thu, 7 Nov 2024 18:22:12 +0330 Subject: [PATCH] Update .gitattributes refactoring codes --- v2rayN/.gitattributes | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/v2rayN/.gitattributes b/v2rayN/.gitattributes index 1ff0c423..bc3b271e 100644 --- a/v2rayN/.gitattributes +++ b/v2rayN/.gitattributes @@ -5,22 +5,19 @@ ############################################################################### # 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 +# This is needed for earlier builds of msysgit that do not have it on by +# default for C# files. Note: This is only used by command line. ############################################################################### #*.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 # 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 # 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 #*.csproj merge=binary @@ -36,19 +33,17 @@ #*.wwaproj merge=binary ############################################################################### -# behavior for image files -# -# image files are treated as binary by default. +# Behavior for image files. +# Image files are treated as binary by default. ############################################################################### #*.jpg binary #*.png 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 -# 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. ############################################################################### #*.doc diff=astextplain