Merge branch 'en/remerge-diff'

[thirdparty/git.git] / apply.c

diff --git a/apply.c b/apply.c
index f66d48ba2f3070822fa9f78bd6d90e41427bc075..0912307bd91a5005d9a4b57e2a4324541e247edc 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -3494,7 +3494,7 @@ static int three_way_merge(struct apply_state *state,
 {
        mmfile_t base_file, our_file, their_file;
        mmbuffer_t result = { NULL };
-       int status;
+       enum ll_merge_result status;
 
        /* resolve trivial cases first */
        if (oideq(base, ours))
@@ -3511,6 +3511,9 @@ static int three_way_merge(struct apply_state *state,
                          &their_file, "theirs",
                          state->repo->index,
                          NULL);
+       if (status == LL_MERGE_BINARY_CONFLICT)
+               warning("Cannot merge binary files: %s (%s vs. %s)",
+                       path, "ours", "theirs");
        free(base_file.ptr);
        free(our_file.ptr);
        free(their_file.ptr);