diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-03 15:15:05 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-03 15:15:05 +0900 |
| commit | 919cec9979a865f8169eaa30e5ff6de8e4fe5565 (patch) | |
| tree | 0d8aca1d417e0462dae1a587077a93d6f44386a0 /builtin/merge-tree.c | |
| parent | 614a0a207999f413206bf547e3c603ac015554b0 (diff) | |
| download | git-919cec9979a865f8169eaa30e5ff6de8e4fe5565.tar.gz git-919cec9979a865f8169eaa30e5ff6de8e4fe5565.tar.bz2 git-919cec9979a865f8169eaa30e5ff6de8e4fe5565.zip | |
Imported Upstream version 2.4.0upstream/2.4.0
Diffstat (limited to 'builtin/merge-tree.c')
| -rw-r--r-- | builtin/merge-tree.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index 2a4aafec..f9ab4859 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -118,8 +118,7 @@ static void show_diff(struct merge_list *entry) if (!dst.ptr) size = 0; dst.size = size; - if (xdi_diff(&src, &dst, &xpp, &xecfg, &ecb)) - die("unable to generate diff"); + xdi_diff(&src, &dst, &xpp, &xecfg, &ecb); free(src.ptr); free(dst.ptr); } |