diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 37ce4f589..e48e90bb6 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -131,6 +131,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; } |