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>

diff --git a/Documentation/config/mergetool.adoc b/Documentation/config/mergetool.adoc
index 6be506145c150bee4c337273884e7ef90815f469..7064f5a462cb561a07d1aa857ab09900828a99ad 100644 (file)
--- a/Documentation/config/mergetool.adoc
+++ b/Documentation/config/mergetool.adoc
@@ -65,7 +65,7 @@ endif::[]
        During a merge, Git will automatically resolve as many conflicts as
        possible and write the `$MERGED` file containing conflict markers around
        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
        that only the unresolved conflicts are presented to the merge tool. Can
        be configured per-tool via the `mergetool.<tool>.hideResolved`