Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'mw/alternates' into next
[gitweb.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;