Merge branch 'rs/combine-diff-with-incompatible-options' into maint

[thirdparty/git.git] / combine-diff.c

diff --git a/combine-diff.c b/combine-diff.c
index 76d2351fce84daea4a5975b6e8727cb121b7ffe4..b0ece9548082c17510b6abd17427434bbf66cae9 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -195,10 +195,10 @@ static struct lline *coalesce_lines(struct lline *base, int *lenbase,
        struct lline *baseend, *newend = NULL;
        int i, j, origbaselen = *lenbase;
 
-       if (newline == NULL)
+       if (!newline)
                return base;
 
-       if (base == NULL) {
+       if (!base) {
                *lenbase = lennew;
                return newline;
        }