diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-28 15:28:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-28 15:28:31 -0700 |
| commit | 6343e2f6f271cf344ea8e7384342502faecaf37c (patch) | |
| tree | 50abed20e4b930022a24b64389915f7c774acef9 /builtin/merge-tree.c | |
| parent | 74b67638166ca2e66497ede559dbf393e7af8b40 (diff) | |
| parent | 18b58f707fdb3ad7d3d4931bd40693834c9ec8a0 (diff) | |
| download | git-6343e2f6f271cf344ea8e7384342502faecaf37c.tar.gz git-6343e2f6f271cf344ea8e7384342502faecaf37c.tar.xz | |
Sync with 2.3.10
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 f9ab48597..2a4aafec6 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -118,7 +118,8 @@ static void show_diff(struct merge_list *entry) if (!dst.ptr) size = 0; dst.size = size; - xdi_diff(&src, &dst, &xpp, &xecfg, &ecb); + if (xdi_diff(&src, &dst, &xpp, &xecfg, &ecb)) + die("unable to generate diff"); free(src.ptr); free(dst.ptr); } |