Skip to content

Commit edbf9a2

Browse files
Neztebgitster
authored andcommitted
mergetool.txt: typofix 'overwriten' -> 'overwritten'
Signed-off-by: Noah Betzen <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 359da65 commit edbf9a2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Documentation/config/mergetool.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ mergetool.hideResolved::
5050
possible and write the 'MERGED' file containing conflict markers around
5151
any conflicts that it cannot resolve; 'LOCAL' and 'REMOTE' normally
5252
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
5454
that only the unresolved conflicts are presented to the merge tool. Can
5555
be configured per-tool via the `mergetool.<tool>.hideResolved`
5656
configuration variable. Defaults to `false`.

0 commit comments

Comments
 (0)