diff options
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/combine-diff.c b/combine-diff.c index 284bec6a..91edce58 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -419,10 +419,8 @@ static void combine_diff(const unsigned char *parent, unsigned int mode, state.num_parent = num_parent; state.n = n; - if (xdi_diff_outf(&parent_file, result_file, consume_line, &state, - &xpp, &xecfg)) - die("unable to generate combined diff for %s", - sha1_to_hex(parent)); + xdi_diff_outf(&parent_file, result_file, consume_line, &state, + &xpp, &xecfg); free(parent_file.ptr); /* Assign line numbers for this parent. |