diff options
Diffstat (limited to 'builtin/merge-tree.c')
| -rw-r--r-- | builtin/merge-tree.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index c61b5b4a10..b3c5692498 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -468,7 +468,8 @@ static int real_merge(struct merge_tree_options *o, } if (o->show_messages) { putchar(line_termination); - merge_display_update_messages(&opt, &result); + merge_display_update_messages(&opt, line_termination == '\0', + &result); } merge_finalize(&opt, &result); return !result.clean; /* result.clean < 0 handled above */ |