diff options
| author | Noah Betzen <noah@nezteb.net> | 2022-10-04 03:55:24 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-05 22:25:56 +0300 |
| commit | edbf9a2e20f659539a3be062c455624a6e7cd77b (patch) | |
| tree | dc5993af45ce39cf7efb1b7e8c05d1c490c92163 /Documentation | |
| parent | 359da658ae32d9a7e5e93ac173fc221352b62917 (diff) | |
mergetool.txt: typofix 'overwriten' -> 'overwritten'
Signed-off-by: Noah Betzen <noah@nezteb.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -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 cafbbef46a..f691afa93d 100644 --- a/Documentation/config/mergetool.txt +++ b/Documentation/config/mergetool.txt @@ -50,7 +50,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`. |