projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
core-tutorial: adjust to recent reality.
[git.git]
/
diff-files.c
diff --git
a/diff-files.c
b/diff-files.c
index
4cafd3e
..
4ba59f1
100644
(file)
--- a/
diff-files.c
+++ b/
diff-files.c
@@
-160,7
+160,7
@@
int main(int argc, const char **argv)
if (combine_merges && num_compare_stages == 2) {
show_combined_diff(&combine.p, 2,
dense_combined_merges,
- NULL
, 0
);
+ NULL);
free(combine.p.path);
continue;
}