X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-tree.c;h=f55a35a9d5f9ae4e3f7d3fd778a953cc9cc533ad;hb=ef5b4eabb6da7cead197e387589896345d3dfbc6;hp=df6fd97fca04369726e92b54ab54c59f808b4742;hpb=ee63802422af14e43eccce3c6dc4150a27ceb1a3;p=git.git diff --git a/diff-tree.c b/diff-tree.c index df6fd97f..f55a35a9 100644 --- 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;