summaryrefslogtreecommitdiff
path: root/diff-files.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-06 06:25:00 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-06 06:25:00 (GMT)
commite3c3a550d4815d34b5674776c36cdd6d8a31ab85 (patch)
tree4e29155b4383f995503807adf76c62f69347ed00 /diff-files.c
parent2718435b7b746c3c249525b02fbcbad68f5a45f3 (diff)
downloadgit-e3c3a550d4815d34b5674776c36cdd6d8a31ab85.zip
git-e3c3a550d4815d34b5674776c36cdd6d8a31ab85.tar.gz
git-e3c3a550d4815d34b5674776c36cdd6d8a31ab85.tar.bz2
combine-diff: remove misguided --show-empty hack.
Now --always flag is available in diff-tree, there is no reason to have that hack in the diffcore side. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff-files.c')
-rw-r--r--diff-files.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-files.c b/diff-files.c
index 4cafd3e..4ba59f1 100644
--- 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;
}