mercurialkdiff3

Suppress needless dialogs from kdiff3?

I use kdiff3 on Windows as the visual merge tool for TortoiseHG / Mercurial.

Often when doing a merge or rebase it will show a dialog like this:

enter image description here

Another variation is that the two files being merged were "binary equal".

Since these messages are basically saying that there is no conflicts / nothing to do, I'd like to suppress them - is that possible?

I don't see anything pertinent in the kdiff3 command line options.

Solution

  • Although having a bit misleading name, --auto option does what you want.

    From the documentation:

    --auto No GUI if all conflicts are auto-solvable. (Needs -o file)

    This help text can also be accessing from the command line with kdiff3 --help.