kristofferhaugsbakk@xxxxxxxxxxxx writes: > From: Kristoffer Haugsbakk <code@xxxxxxxxxxxxxxx> > > Revert back to “Git's” which was used before d30c5cc4592 (doc: convert > git-mergetool options to new synopsis style, 2025-05-25) accidentally > changed it. > > Signed-off-by: Kristoffer Haugsbakk <code@xxxxxxxxxxxxxxx> > --- > diff --git a/Documentation/config/mergetool.adoc b/Documentation/config/mergetool.adoc > index 6be506145c1..7064f5a462c 100644 > --- a/Documentation/config/mergetool.adoc > +++ b/Documentation/config/mergetool.adoc > @@ -65,7 +65,7 @@ endif::[] > During a merge, Git will automatically resolve as many conflicts as > possible and write the `$MERGED` file containing conflict markers around > any conflicts that it cannot resolve; `$LOCAL` and `$REMOTE` normally > - are the versions of the file from before Git`s conflict > + are the versions of the file from before Git's conflict > resolution. This flag causes `$LOCAL` and `$REMOTE` to be overwritten so > that only the unresolved conflicts are presented to the merge tool. Can > be configured per-tool via the `mergetool.<tool>.hideResolved` Obviously correct. Thanks.
