freshlybakedca.ke
Git fork
Merge branch 'kh/doc-config-typofix' into maint-2.51
Documentation typofix.
* kh/doc-config-typofix:
doc: config: replace backtick with apostrophe for possessive
+1
-1
Documentation/config/mergetool.adoc
+1
-1
Documentation/config/mergetool.adoc
···
65
During a merge, Git will automatically resolve as many conflicts as
66
possible and write the `$MERGED` file containing conflict markers around
67
any conflicts that it cannot resolve; `$LOCAL` and `$REMOTE` normally
68
-
are the versions of the file from before Git`s conflict
69
resolution. This flag causes `$LOCAL` and `$REMOTE` to be overwritten so
70
that only the unresolved conflicts are presented to the merge tool. Can
71
be configured per-tool via the `mergetool.<tool>.hideResolved`
···
65
During a merge, Git will automatically resolve as many conflicts as
66
possible and write the `$MERGED` file containing conflict markers around
67
any conflicts that it cannot resolve; `$LOCAL` and `$REMOTE` normally
68
+
are the versions of the file from before Git's conflict
69
resolution. This flag causes `$LOCAL` and `$REMOTE` to be overwritten so
70
that only the unresolved conflicts are presented to the merge tool. Can
71
be configured per-tool via the `mergetool.<tool>.hideResolved`