Merge branch 'jk/cocci'

diff --git a/builtin/am.c b/builtin/am.c
index e54110d4742e19b55a49ab569650d4a9b4511786..162a048bf7a6399b3ab1b5a33045ba726803ff0e 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1598,6 +1598,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa
        o.branch1 = "HEAD";
        their_tree_name = xstrfmt("%.*s", linelen(state->msg), state->msg);
        o.branch2 = their_tree_name;
+       o.detect_directory_renames = 0;
 
        if (state->quiet)
                o.verbosity = 0;