diff mbox series

[v2,4/6] git-merge.txt: modernize word choice in "True merge" section

Message ID f1d99453f54fa08c5eb38340d50cb984fc4eb7a0.1684783741.git.gitgitgadget@gmail.com (mailing list archive)
State Accepted
Commit b7dd54a2c7df5e1dbe713807afb49fb77c9b7fc7
Headers show
Series Document 'AUTO_MERGE' and more special refs | expand

Commit Message

Philippe Blain May 22, 2023, 7:28 p.m. UTC 
From: Philippe Blain <levraiphilippeblain@gmail.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>
---
 Documentation/git-merge.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 0aeff572a59..23aefe28851 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