Merge branch 'jc/cache-tree' into next

diff --git a/builtin-diff.c b/builtin-diff.c
index b6114ce948bfcb68018fb9799bb26836957bb9c2..636edbf2a79f4e757866a08b221374e91e3dfe3b 100644 (file)
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -271,7 +271,7 @@ int cmd_diff(int argc, const char **argv, char **envp)
         *
         * Other cases are errors.
         */
-       
+
        git_config(git_diff_config);
        init_revisions(&rev);
        rev.diffopt.output_format = DIFF_FORMAT_PATCH;
@@ -321,7 +321,7 @@ int cmd_diff(int argc, const char **argv, char **envp)
                        blob[blobs].name = name;
                        blobs++;
                        continue;
-                       
+
                }
                die("unhandled object '%s' given.", name);
        }