diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:23:45 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:23:54 -0700 |
commit | 1c88a6d17492b197b9b3298cbc34efa804928302 (patch) | |
tree | b0370caa6322930a13898673c5a559aef20c8791 /builtin/merge.c | |
parent | Merge branch 'js/use-sc-open-max' into maint (diff) | |
parent | Git 1.7.11.6 (diff) | |
download | tgif-1c88a6d17492b197b9b3298cbc34efa804928302.tar.xz |
Sync with 1.7.11.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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); |