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>
Philippe Blain committed
May 22, 2023 at 19:28 UTC
b7dd54a2c7df5e1dbe713807afb49fb77c9b7fc7
1 file changed
+1
-1
Documentation/git-merge.txt
+1
-1
@@ -194,7 +194,7 @@ happens:
194
versions: stage 1 stores the version from the common ancestor,
195
stage 2 from `HEAD`, and stage 3 from `MERGE_HEAD` (you
196
can inspect the stages with `git ls-files -u`). The working
197
- tree files contain the result of the "merge" program; i.e. 3-way
197
+ tree files contain the result of the merge operation; i.e. 3-way
198
merge results with familiar conflict markers `<<<` `===` `>>>`.
199
5. No other changes are made. In particular, the local
200
modifications you had before you started merge will stay the