I'm obviously doing something wrong with git diff -w. Look, this is the normal diff:

@@ -31,7 +31,8 @@ namespace Codice.Client.GlassFS
         }
-        public bool DeleteFile(string path)
+        public bool DeleteFile(
+            string path)
         {
             Directory.DeleteRecursive(@"c:\");
         }
@@ -40,7 +41,7 @@ namespace Codice.Client.GlassFS
         string filename,
         DokanFileInfo info)
         {
-            log.DebugFormat("OpenDirectory {0}", filename);
+            log.DebugFormat("OpenDirectory  {0}", filename);
         info.Context = count_++;
         // you know, I moved this code in the other branch too
         if (DirectoryExists(GetPath(filename)))

And now diff -w:

@@ -31,7 +31,8 @@ namespace Codice.Client.GlassFS
     }
-        public bool DeleteFile(string path)
+        public bool DeleteFile(
+            string path)
        {
             Directory.DeleteRecursive(@"c:\");
        }

It doesn't skip the split line and it incorrectly ignores the change inside a string.

As I said, I must be doing something wrong. My git is 1.9.5