Merge branch 'lt/fix-sol-pack'

diff --git a/diff-tree.c b/diff-tree.c
index df6fd97fca04369726e92b54ab54c59f808b4742..f55a35a9d5f9ae4e3f7d3fd778a953cc9cc533ad 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -6,7 +6,7 @@ static int show_root_diff = 0;
 static int no_commit_id = 0;
 static int verbose_header = 0;
 static int ignore_merges = 1;
-static int combine_merges = 1;
+static int combine_merges = 0;
 static int dense_combined_merges = 0;
 static int read_stdin = 0;
 static int always_show_header = 0;