kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'kh/doc-config-typofix' into maint-2.51 

Documentation typofix.

* kh/doc-config-typofix:
  doc: config: replace backtick with apostrophe for possessive
maint
Junio C Hamano 2025-10-14 13:40:55 -07:00
parent fb3f8af737 44dce6541c
commit 12c542bbcf
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config/mergetool.adoc
View File

@ -65,7 +65,7 @@ endif::[]
During a merge, Git will automatically resolve as many conflicts as During a merge, Git will automatically resolve as many conflicts as
possible and write the `$MERGED` file containing conflict markers around possible and write the `$MERGED` file containing conflict markers around
any conflicts that it cannot resolve; `$LOCAL` and `$REMOTE` normally any conflicts that it cannot resolve; `$LOCAL` and `$REMOTE` normally
are the versions of the file from before Git`s conflict are the versions of the file from before Git's conflict
resolution. This flag causes `$LOCAL` and `$REMOTE` to be overwritten so resolution. This flag causes `$LOCAL` and `$REMOTE` to be overwritten so
that only the unresolved conflicts are presented to the merge tool. Can that only the unresolved conflicts are presented to the merge tool. Can
be configured per-tool via the `mergetool.<tool>.hideResolved` be configured per-tool via the `mergetool.<tool>.hideResolved`