From e3c3a550d4815d34b5674776c36cdd6d8a31ab85 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 5 Feb 2006 22:25:00 -0800 Subject: 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 --- diff-files.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'diff-files.c') diff --git a/diff-files.c b/diff-files.c index 4cafd3ea2..4ba59f1a2 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; } -- cgit v1.2.1