Hi, I tried it myself and it writing "/D <target folder>" didn't work, but the examples from the nsis docs http://nsis.sourceforge.net/Docs/Chapter3.html#3.2.3 show "/D=<target folder>" and that worked for me. The "=" makes all the difference. Joachim.
2012-05-12 14:22:03 PDT in KDiff3
Hi Nigel, Thank you for the patch. I've applied it as svn revision 157. Regarding the fileaccess-patch: I've changed it to this: #if defined(Q_WS_WIN) if ( !bExistsLocal ) { // git on Cygwin will put files in /tmp // A workaround for the a native kdiff3 binary to find them... QString cygwinBin =...
2012-04-10 16:12:38 PDT in KDiff3
joachim99 committed revision 157 to the KDiff3 SVN repository, changing 15 files.
2012-04-10 16:01:50 PDT in KDiff3
Thanks for the patch. I changed the first line into: p->setWindowState( p->windowState() | Qt::WindowActive ); because otherwise a maximized state is lost. SVN Revision 156 Joachim.
2012-04-10 15:15:59 PDT in KDiff3
joachim99 committed revision 156 to the KDiff3 SVN repository, changing 1 files.
2012-04-10 15:15:22 PDT in KDiff3
joachim99 committed revision 155 to the KDiff3 SVN repository, changing 3 files.
2012-04-08 14:53:46 PDT in KDiff3
joachim99 committed revision 154 to the KDiff3 SVN repository, changing 1 files.
2012-01-25 03:20:17 PST in KDiff3
Hi, KDiff3 already has a similar feature called "Preprocessor" in the "Diff"-options. The winmerge plugin xdocdiffPlugin_1_0_6c.zip package contains a file xdoc2txt.exe. This extracts the text from files in various formats and writes plain text files. You can also use it with KDiff3! But you need some kind of wrapper. Here is an example perl-script for doc-files...
2012-01-18 06:04:02 PST in KDiff3
When the output window is visible then you are already in merge mode. Then you can choose the inputs A or B or C (if exists). Sometimes you want all changes from either side. There are some actions in the "Merge"-menu for that. ("Choose A for all conflicts" etc.) When you are done (no conflicts left) you should be able to save. You can also try to exit and KDiff3 will...
2012-01-12 13:09:16 PST in KDiff3