diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-10-14 13:40:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-14 13:40:55 -0700 |
| commit | 12c542bbcf912fde5171ffc623bb0a68666287f4 (patch) | |
| tree | b237556dcf37032df79a75a5b3b8ffaa6ae71258 /Documentation | |
| parent | fb3f8af7375627a61652c3e0cfe97f9f8170703f (diff) | |
| parent | 44dce6541ca2e9f3af045055fe62996a8f221660 (diff) | |
| download | git-12c542bbcf912fde5171ffc623bb0a68666287f4.tar.xz | |
Merge branch 'kh/doc-config-typofix' into maint-2.51
Documentation typofix.
* kh/doc-config-typofix:
doc: config: replace backtick with apostrophe for possessive
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config/mergetool.adoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config/mergetool.adoc b/Documentation/config/mergetool.adoc index 6be506145c..7064f5a462 100644 --- 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` |