diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-28 15:33:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-28 15:33:56 -0700 |
| commit | 11a458befcd7662fbe6d2d53c76d49ae2b0fe219 (patch) | |
| tree | de4cf6a8a43cb30b53f924ed8820de09409f0afd /builtin/merge-tree.c | |
| parent | ee6ad5f4d56e697c972af86cbefdf269b386e470 (diff) | |
| parent | a2558fb8e1e387b630312311e1d22c95663da5d0 (diff) | |
| download | git-11a458befcd7662fbe6d2d53c76d49ae2b0fe219.tar.gz | |
Sync with 2.4.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 f9ab48597e..2a4aafec6a 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); } |