diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-12-15 18:39:47 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-15 18:39:47 +0100 |
| commit | 4ce498baa3976cf96d3feb4215a486dd47ec2e7b (patch) | |
| tree | 6461c3669e41cebaf33f124d5964c06072803187 /builtin/checkout.c | |
| parent | Merge branch 'ds/trace2-regions-in-tests' (diff) | |
| parent | update documentation for new zdiff3 conflictStyle (diff) | |
| download | git-4ce498baa3976cf96d3feb4215a486dd47ec2e7b.tar.xz git-4ce498baa3976cf96d3feb4215a486dd47ec2e7b.zip | |
Merge branch 'en/zdiff3'
"Zealous diff3" style of merge conflict presentation has been added.
* en/zdiff3:
update documentation for new zdiff3 conflictStyle
xdiff: implement a zealous diff3, or "zdiff3"
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 3fe87a632e..72beeb49aa 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1536,7 +1536,7 @@ static struct option *add_common_options(struct checkout_opts *opts, OPT_BOOL(0, "progress", &opts->show_progress, N_("force progress reporting")), OPT_BOOL('m', "merge", &opts->merge, N_("perform a 3-way merge with the new branch")), OPT_STRING(0, "conflict", &opts->conflict_style, N_("style"), - N_("conflict style (merge or diff3)")), + N_("conflict style (merge, diff3, or zdiff3)")), OPT_END() }; struct option *newopts = parse_options_concat(prevopts, options); |