Merge branch 'jc/finalize-temp-file'

diff --git a/builtin/am.c b/builtin/am.c
index 84d57d4297d7c77c0ff99cd6c622d4921f5733a9..1399c8dd880f86190534b9c9e0a5e84f48ebeceb 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -152,6 +152,8 @@ static void am_state_init(struct am_state *state, const char *dir)
 
        state->prec = 4;
 
+       git_config_get_bool("am.threeway", &state->threeway);
+
        state->utf8 = 1;
 
        git_config_get_bool("am.messageid", &state->message_id);