diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-28 19:16:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-28 19:16:54 -0700 |
| commit | 3adc4ec7b9e1d2118501728a75a5b93d971974fa (patch) | |
| tree | 807d65746060e9967d6d016b230730ef5fd24334 /builtin/merge-tree.c | |
| parent | be08dee9738eaaa0423885ed189c2b6ad8368cf0 (diff) | |
| parent | 24358560c3c0ab51c9ef8178d99f46711716f6c0 (diff) | |
| download | git-3adc4ec7b9e1d2118501728a75a5b93d971974fa.tar.gz git-3adc4ec7b9e1d2118501728a75a5b93d971974fa.tar.xz | |
Sync with v2.5.4
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); } |