| commit | b7dd54a2c7df5e1dbe713807afb49fb77c9b7fc7 | |
| author | Philippe Blain <levraiphilippeblain@gmail.com> | |
| Mon, 22 May 2023 19:28:59 +0000 (22 19:28 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 23 May 2023 08:21:47 +0000 (23 17:21 +0900) | ||
| tree | 0c66e00511f49cf449675a97d8a8e9704dee05b1 | treesnapshot (tar.gz zip) |
| parent | 1ef3c61b7889e2aa76a8f0d32a88fbc09fca3b8e | commitdiff |
git-merge.txt: modernize word choice in "True merge" section
The "True merge" section of the 'git merge' documentation mentions that
in case of conflicts, the conflicted working tree files contain "the
result of the "merge" program". This probably refers to RCS's 'merge'
program, which is mentioned further down under "How conflicts are
presented".
Since it is not clear at that point of the document which program is
referred to, and since most modern readers probably do not relate to RCS
anyway, let's just write "the merge operation" instead.
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The "True merge" section of the 'git merge' documentation mentions that
in case of conflicts, the conflicted working tree files contain "the
result of the "merge" program". This probably refers to RCS's 'merge'
program, which is mentioned further down under "How conflicts are
presented".
Since it is not clear at that point of the document which program is
referred to, and since most modern readers probably do not relate to RCS
anyway, let's just write "the merge operation" instead.
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-merge.txt | diffblobblamehistory |