Skip to content

Commit 44dce65

Browse files
LemmingAvalanchegitster
authored andcommitted
doc: config: replace backtick with apostrophe for possessive
Revert back to “Git's” which was used before d30c5cc (doc: convert git-mergetool options to new synopsis style, 2025-05-25) accidentally changed it. Signed-off-by: Kristoffer Haugsbakk <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d30c5cc commit 44dce65

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Documentation/config/mergetool.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ endif::[]
6565
During a merge, Git will automatically resolve as many conflicts as
6666
possible and write the `$MERGED` file containing conflict markers around
6767
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
6969
resolution. This flag causes `$LOCAL` and `$REMOTE` to be overwritten so
7070
that only the unresolved conflicts are presented to the merge tool. Can
7171
be configured per-tool via the `mergetool.<tool>.hideResolved`

0 commit comments

Comments
 (0)