Binary file detection fixed. Close #1585

13 years ago · f05d9ac43d
2 changed files with 3 additions and 3 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1 +1 @@
-
+*.xml -text
--- a/GitCommands/FileHelper.cs
+++ b/GitCommands/FileHelper.cs
@ -75,7 +75,7 @@ namespace GitCommands
                {
                    if (parts.Length < 2 || parts[0][0] == '#')
                        continue;
-                    if (parts.Contains("binary") || parts.Contains("-text"))
+                    if (parts.Contains("binary") || parts.Contains("-diff"))
                    {
                        try
                        {
@ -87,7 +87,7 @@ namespace GitCommands
                            continue;
                        }
                    }
-                    if (parts.Contains("text"))
+                    if (parts.Contains("diff"))
                    {
                        try
                        {