diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:46:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-05 13:20:08 -0700 |
| commit | 590f6e4235a7d44ad39511186ca8bbac02ae8c2e (patch) | |
| tree | 6999a9512d87bbc06dfb3308fdc824e5226e7597 /builtin/merge-tree.c | |
| parent | e13d854322ad802213aea13409505c765b5c68d1 (diff) | |
| parent | 22f698cb188243b313e024d618283e0293e37140 (diff) | |
| download | git-590f6e4235a7d44ad39511186ca8bbac02ae8c2e.tar.gz git-590f6e4235a7d44ad39511186ca8bbac02ae8c2e.tar.xz | |
Sync with 2.6.1
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); } |