Patrick Higgins <patrick.higgins@xxxxxxxx> writes: > Qt-only builds of kdiff3 (no KDE) do not support a bare '--' on the command > line. It will fail silently and mysteriously. > > Signed-off-by: Patrick Higgins <patrick.higgins@xxxxxxxx> Hmm, I am seeing this patch for the first time, I have not seen any discussion history leading to the patch, and I have not been primarily involved in mergetool. I'll Cc Ted to see what he thinks... > +mergetool.kdiff3.doubledash:: > + A boolean to indicate whether or not your kdiff3 supports a '--' > + on the command line to separate options from filenames. If you > + built it without KDE, it probably doesn't have this support and > + you should set this to false. Defaults to true. The above description makes it clear that there is an issue that needs to be addressed. I however am wondering if this can be either autodetected at runtime, or if it can't, the user should be able to specify the option when the user runs mergetool from the command line. It would be necessary to countermand whichever choice you configured in your config when you need to run kdiff3 with KDE from one machine and the one without from another machine, wouldn't it? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
