diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-08-30 16:06:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-30 16:06:01 -0700 |
| commit | aca13c2355e7188432cb32aedf0bb0c477ec011a (patch) | |
| tree | 424f1e238007c0f5a1b2f97d1fc8b0bb71f61d30 /builtin/merge.c | |
| parent | Merge branch 'en/pull-conflicting-options' (diff) | |
| parent | Update error message and code comment (diff) | |
| download | tgif-aca13c2355e7188432cb32aedf0bb0c477ec011a.tar.xz | |
Merge branch 'en/merge-strategy-docs'
Documentation updates.
* en/merge-strategy-docs:
Update error message and code comment
merge-strategies.txt: add coverage of the `ort` merge strategy
git-rebase.txt: correct out-of-date and misleading text about renames
merge-strategies.txt: fix simple capitalization error
merge-strategies.txt: avoid giving special preference to patience algorithm
merge-strategies.txt: do not imply using copy detection is desired
merge-strategies.txt: update wording for the resolve strategy
Documentation: edit awkward references to `git merge-recursive`
directory-rename-detection.txt: small updates due to merge-ort optimizations
git-rebase.txt: correct antiquated claims about --rebase-merges
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 6027cdf5a7..8d00fa6a9f 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -739,7 +739,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common, for (x = 0; x < xopts_nr; x++) if (parse_merge_opt(&o, xopts[x])) - die(_("Unknown option for merge-recursive: -X%s"), xopts[x]); + die(_("unknown strategy option: -X%s"), xopts[x]); o.branch1 = head_arg; o.branch2 = merge_remote_util(remoteheads->item)->name; |