mergetool.txt: typofix 'overwriten' -> 'overwritten'
Signed-off-by: Noah Betzen <noah@nezteb.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Noah Betzen committed
Oct 4, 2022 at 00:55 UTC
edbf9a2e20f659539a3be062c455624a6e7cd77b
1 file changed
+1
-1
Documentation/config/mergetool.txt
+1
-1
@@ -50,7 +50,7 @@ mergetool.hideResolved::
50
possible and write the 'MERGED' file containing conflict markers around
51
any conflicts that it cannot resolve; 'LOCAL' and 'REMOTE' normally
52
represent the versions of the file from before Git's conflict
53
- resolution. This flag causes 'LOCAL' and 'REMOTE' to be overwriten so
53
+ resolution. This flag causes 'LOCAL' and 'REMOTE' to be overwritten so
54
that only the unresolved conflicts are presented to the merge tool. Can
55
be configured per-tool via the `mergetool.<tool>.hideResolved`
56
configuration variable. Defaults to `false`.