diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-10-26 02:11:38 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-26 02:11:38 +0200 |
| commit | b30a4435ed0e96212f6023cb7a952b95a58de818 (patch) | |
| tree | 45ae507cb2c5101498c13133f0b064bdc3dd4696 | |
| parent | Merge branch 'jk/sequencer-missing-author-name-check' into maint-2.38 (diff) | |
| parent | mergetool.txt: typofix 'overwriten' -> 'overwritten' (diff) | |
| download | git-b30a4435ed0e96212f6023cb7a952b95a58de818.tar.xz git-b30a4435ed0e96212f6023cb7a952b95a58de818.zip | |
Merge branch 'nb/doc-mergetool-typofix' into maint-2.38
Typofix.
* nb/doc-mergetool-typofix:
mergetool.txt: typofix 'overwriten' -> 'overwritten'
| -rw-r--r-- | Documentation/config/mergetool.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt index 90b3809700..e779a122d8 100644 --- a/Documentation/config/mergetool.txt +++ b/Documentation/config/mergetool.txt @@ -59,7 +59,7 @@ mergetool.hideResolved:: possible and write the 'MERGED' file containing conflict markers around any conflicts that it cannot resolve; 'LOCAL' and 'REMOTE' normally represent the versions of the file from before Git's conflict - resolution. This flag causes 'LOCAL' and 'REMOTE' to be overwriten so + 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` configuration variable. Defaults to `false`. |