Code

difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff