Merge branch 'en/merge-recursive-cleanup'

[thirdparty/git.git] / builtin / am.c

diff --git a/builtin/am.c b/builtin/am.c
index 761cac39e02a7f45dd7f95f05d31e0ad373be214..8181c2aef39fbe04e797d521d757e3ac5628fd00 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1526,7 +1526,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;
+       o.detect_directory_renames = MERGE_DIRECTORY_RENAMES_NONE;
 
        if (state->quiet)
                o.verbosity = 0;