Am 28.12.20 um 05:54 schrieb Seth House: > diff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt > index 16a27443a3..7ce6d0d3ac 100644 > --- a/Documentation/config/mergetool.txt > +++ b/Documentation/config/mergetool.txt > @@ -61,3 +61,6 @@ mergetool.writeToTemp:: > > mergetool.prompt:: > Prompt before each invocation of the merge resolution program. > + > +mergetool.autoMerge:: > + Remove lines without conflicts from all the files. Defaults to `true`. This text, starting with "Remove lines", sounds alarming. Isn't it more along the lines of: Consolidate non-conflicting parts, so that only conflicting parts are presented to the merge tool. Defaults to `true`. It would be great to keep the list of config entries sorted. I know that mergetool.prompt is not at the correct location, but that shouldn't be an excuse to make the situation worse. -- Hannes
