Merge branch 'bw/format-patch-o-create-leading-dirs'

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

diff --git a/builtin/am.c b/builtin/am.c
index 39a70fc79af999c95d4fa6865585208278023229..8181c2aef39fbe04e797d521d757e3ac5628fd00 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -24,7 +24,6 @@
 #include "sequencer.h"
 #include "revision.h"
 #include "merge-recursive.h"
-#include "revision.h"
 #include "log-tree.h"
 #include "notes-utils.h"
 #include "rerere.h"
@@ -1527,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;