diff options
| author | Philippe Blain <levraiphilippeblain@gmail.com> | 2023-05-22 22:28:59 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-05-23 11:21:47 +0300 |
| commit | b7dd54a2c7df5e1dbe713807afb49fb77c9b7fc7 (patch) | |
| tree | 0c66e00511f49cf449675a97d8a8e9704dee05b1 /Documentation/git-merge.txt | |
| parent | 1ef3c61b7889e2aa76a8f0d32a88fbc09fca3b8e (diff) | |
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>
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 0aeff572a5..23aefe2885 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -194,7 +194,7 @@ happens: versions: stage 1 stores the version from the common ancestor, stage 2 from `HEAD`, and stage 3 from `MERGE_HEAD` (you can inspect the stages with `git ls-files -u`). The working - tree files contain the result of the "merge" program; i.e. 3-way + tree files contain the result of the merge operation; i.e. 3-way merge results with familiar conflict markers `<<<` `===` `>>>`. 5. No other changes are made. In particular, the local modifications you had before you started merge will stay the |