diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-22 11:52:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-22 11:52:27 -0700 |
| commit | 9cd33bbc529bfa830c687d377433c46474d10e6a (patch) | |
| tree | 79268934569751906061421fcd5c46b751441c67 /builtin/merge.c | |
| parent | 8d35c114579fd870feb61f3746e1371634fd2163 (diff) | |
| parent | 28452655af988094792483a51d188c58137760cd (diff) | |
| download | git-9cd33bbc529bfa830c687d377433c46474d10e6a.tar.gz | |
Merge branch 'tr/void-diff-setup-done'
Remove unnecessary code.
* tr/void-diff-setup-done:
diff_setup_done(): return void
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index dd50a0c57b..e81fde6d79 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -404,8 +404,7 @@ static void finish(struct commit *head_commit, opts.output_format |= DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT; opts.detect_rename = DIFF_DETECT_RENAME; - if (diff_setup_done(&opts) < 0) - die(_("diff_setup_done failed")); + diff_setup_done(&opts); diff_tree_sha1(head, new_head, "", &opts); diffcore_std(&opts); diff_flush(&opts); |