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>
Kristoffer Haugsbakk committed
Aug 24, 2025 at 21:46 UTC
44dce6541ca2e9f3af045055fe62996a8f221660
1 file changed
+1
-1
Documentation/config/mergetool.adoc
+1
-1
@@ -65,7 +65,7 @@ endif::[]
65
During a merge, Git will automatically resolve as many conflicts as
66
possible and write the `$MERGED` file containing conflict markers around
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
resolution. This flag causes `$LOCAL` and `$REMOTE` to be overwritten so
70
that only the unresolved conflicts are presented to the merge tool. Can
71
be configured per-tool via the `mergetool.<tool>.hideResolved`