diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:43:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:43:43 -0700 |
| commit | 460645a8c331196c3e5e61de4acf3f9c5803e335 (patch) | |
| tree | ea40e43d2d844ec5fd455d0ba41a3c67bb6bf390 /builtin | |
| parent | 7bdaf0bd1cffde9b3d14762f67f22991e8e17ef6 (diff) | |
| parent | 0e1b50152bfc12d2d286af17993f6356171e9ce5 (diff) | |
| download | git-460645a8c331196c3e5e61de4acf3f9c5803e335.tar.gz | |
Merge branch 'jn/merge-custom-no-trivial'
* jn/merge-custom-no-trivial:
t7606: Avoid using head as a file name
merge: let custom strategies intervene in trivial merges
t7606 (merge-theirs): modernize style
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 576e81f145..4e4ec898e6 100644 --- 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; } |