diff options
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index a25951475..32b4d9d02 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -704,7 +704,6 @@ int checkout_fast_forward(const unsigned char *head, const unsigned char *remote opts.verbose_update = 1; opts.merge = 1; opts.fn = twoway_merge; - opts.show_all_errors = 1; setup_unpack_trees_porcelain(&opts, "merge"); trees[nr_trees] = parse_tree_indirect(head); |