Merge branch 'np/pack' into next

[git.git] / builtin-diff.c

diff --git a/builtin-diff.c b/builtin-diff.c
index 20873162f98478b60b069e97305ab34425c5dde4..71742aa10b3b8e2621eecd4be929946b0a308deb 100644 (file)
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -84,8 +84,7 @@ static void stuff_change(struct diff_options *opt,
 
        if (opt->reverse_diff) {
                unsigned tmp;
-               const
-                       const unsigned char *tmp_u;
+               const unsigned char *tmp_u;
                const char *tmp_c;
                tmp = old_mode; old_mode = new_mode; new_mode = tmp;
                tmp_u = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_u;