diff options
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index f270fa66f3..6c40c61c47 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -3759,6 +3759,10 @@ int parse_merge_opt(struct merge_options *o, const char *s) return -1; o->merge_detect_rename = 1; } + /* + * Please update $__git_merge_strategy_options in + * git-completion.bash when you add new options + */ else return -1; return 0; |