From: Noah Betzen Date: Tue, 4 Oct 2022 00:55:24 +0000 (+0000) Subject: mergetool.txt: typofix 'overwriten' -> 'overwritten' X-Git-Tag: v2.38.2~27^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edbf9a2e20f659539a3be062c455624a6e7cd77b;p=thirdparty%2Fgit.git mergetool.txt: typofix 'overwriten' -> 'overwritten' Signed-off-by: Noah Betzen Signed-off-by: Junio C Hamano --- 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..hideResolved` configuration variable. Defaults to `false`.