freshlybakedca.ke
Git fork
Merge branch 'nb/doc-mergetool-typofix' into maint-2.38
Typofix.
* nb/doc-mergetool-typofix:
mergetool.txt: typofix 'overwriten' -> 'overwritten'
+1
-1
Documentation/config/mergetool.txt
+1
-1
Documentation/config/mergetool.txt
···
59
59
possible and write the 'MERGED' file containing conflict markers around
60
60
any conflicts that it cannot resolve; 'LOCAL' and 'REMOTE' normally
61
61
represent the versions of the file from before Git's conflict
62
-
resolution. This flag causes 'LOCAL' and 'REMOTE' to be overwriten so
62
+
resolution. This flag causes 'LOCAL' and 'REMOTE' to be overwritten so
63
63
that only the unresolved conflicts are presented to the merge tool. Can
64
64
be configured per-tool via the `mergetool.<tool>.hideResolved`
65
65
configuration variable. Defaults to `false`.