Version: 0.9.92 (using KDE 3.5.9) Compiler: gcc (Debian 4.3.2-1) 4.3.2 OS: Linux Installed from: Debian testing/unstable Packages I tried adding it to the list of "Command line options to ignore" as I could find no other way to disable this option. `git-mergetool` version calls kdiff3 like this: kdiff3 --auto --L1 "$MERGED (Base)" --L2 "$MERGED (Local)" --L3 "$MERGED (Remote)" -o "$MERGED" -- "$BASE" "$LOCAL" "$REMOTE" > /dev/null 2>&1 While it is possible to add a config setting, it may also be useful to allow supported options to be ignored.
It is now possible to build kdiff3 without the --auto option. Would still be nice to be able to filter it out.
Git commit a90c16f93988e6531db546f8d4ac404673ab240a by Michael Reeves. Committed on 21/02/2020 at 19:16. Pushed by mreeves into branch 'master'. Add --noauto option Implement feature request for disabling --auto as git is hard coded to pass this. FIXED-IN:1.9 M +1 -0 doc/en/index.docbook M +1 -0 doc/en/man-kdiff3.1.docbook M +1 -1 src/kdiff3.cpp M +2 -0 src/main.cpp https://invent.kde.org/kde/kdiff3/commit/a90c16f93988e6531db546f8d4ac404673ab240a