Git fork

doc: config: replace backtick with apostrophe for possessive

Revert back to “Git's” which was used before d30c5cc4592 (doc: convert
git-mergetool options to new synopsis style, 2025-05-25) accidentally
changed it.

Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

Kristoffer Haugsbakk and committed by
Junio C Hamano
44dce654 d30c5cc4

+1 -1
+1 -1
Documentation/config/mergetool.adoc
··· 65 65 During a merge, Git will automatically resolve as many conflicts as 66 66 possible and write the `$MERGED` file containing conflict markers around 67 67 any conflicts that it cannot resolve; `$LOCAL` and `$REMOTE` normally 68 - are the versions of the file from before Git`s conflict 68 + are the versions of the file from before Git's conflict 69 69 resolution. This flag causes `$LOCAL` and `$REMOTE` to be overwritten so 70 70 that only the unresolved conflicts are presented to the merge tool. Can 71 71 be configured per-tool via the `mergetool.<tool>.hideResolved`