merge-recursive: handle return values indicating errors

diff --git a/diffcore-break.c b/diffcore-break.c
index a3e796089ffad89a6f17074f4fe8848f7a13275e..881a74f29e4f6033a2547f2558a5ad8a3eaad584 100644 (file)
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -57,7 +57,7 @@ static int should_break(struct diff_filespec *src,
                return 1; /* even their types are different */
        }
 
-       if (src->sha1_valid && dst->sha1_valid &&
+       if (src->oid_valid && dst->oid_valid &&
            !oidcmp(&src->oid, &dst->oid))
                return 0; /* they are the same */