We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 359da65 commit edbf9a2Copy full SHA for edbf9a2
Documentation/config/mergetool.txt
@@ -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
+ 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`.
0 commit comments