Merge branch 'jn/merge-custom-no-trivial'

[git.git] / builtin / merge.c

diff --git a/builtin/merge.c b/builtin/merge.c
index 576e81f14578661461d71230c896436fab3023f9..4e4ec898e6cd8bed9f43e2cb8d8958cd6160e766 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -132,6 +132,7 @@ static struct strategy *get_strategy(const char *name)
 
        ret = xcalloc(1, sizeof(struct strategy));
        ret->name = xstrdup(name);
+       ret->attr = NO_TRIVIAL;
        return ret;
 }