diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-09-02 08:21:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-09-02 08:21:26 -0700 |
| commit | 8095cfbbf58cc29dff31ff6679ef06fbf0be25c1 (patch) | |
| tree | 55954f15df888daf8bf3f1ac598f1f274a2be936 | |
| parent | Merge branch 'kh/doc-interpret-trailers-markup-fix' (diff) | |
| parent | doc: config: replace backtick with apostrophe for possessive (diff) | |
| download | git-8095cfbbf58cc29dff31ff6679ef06fbf0be25c1.tar.gz git-8095cfbbf58cc29dff31ff6679ef06fbf0be25c1.zip | |
Merge branch 'kh/doc-config-typofix'
Documentation typofix.
* kh/doc-config-typofix:
doc: config: replace backtick with apostrophe for possessive
| -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` |