Code

Programming Languages: C++

License: GNU General Public License version 2.0 (GPLv2)

Repositories

browse code, statistics, last commit on 2012-04-10 svn co https://kdiff3.svn.sourceforge.net/svnroot/kdiff3 kdiff3

Show:

What's happening?

  • Three way merge has problems with braces

    OS: Windows 7 x64 and Windows XP 32 Bit Kdiff3 0.9.95-2 and 0.9.96 I want to perform a three way merge. Please have a look at the screenshot, it shows the problem: In .BASE there are two functions. Then in .THIS the last function is gone. Finally in .OTHER there are also two functions, but the first one is shortened. However, in the merge result there is a right brace too much. It seems...

    2012-05-22 04:52:26 PDT by A. Bachmann

  • Followup: RE: Windows installer command line options ?

    Thanks, Joachim, it works. And sorry for not being careful about this "detail" ... which does the whole thing :-)

    2012-05-14 04:21:23 PDT by pouillot

  • Followup: RE: Windows installer command line options ?

    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 by joachim99

  • Windows installer command line options ?

    Hi. I'd like to install KDiff3 under Windows into a custom folder. OK, it's easy to achieve when running the installer interactively. But what if I'm shipping KDiff3 to my end-users by installing it silently from a home-made NSI installer (which of course installs other stuff) ? In other words, is there a command line option to specify the target install folder ? (I've already...

    2012-05-11 07:56:12 PDT by pouillot

  • Ctrl+C does not work in Output path field

    In Kdiff3 0.9.94, the expected behaviour is for me to be able to use Ctrl+C to copy the path in the Output field when merging, but I can't. I can right-click and choose Copy as a work-around though, but could you please look into activation of Ctrl+C for the Output text box? Thank you.

    2012-04-25 04:58:23 PDT by skarpsovs

  • add option to disable column auto-resize

    Typical situation: I'm comparing folder hierarchies, scanning the list of subfolders for red or black icons. When I find one, I click the plus sign to the left end of the row to check what specifically the difference is, and - suddenly I can't see the icons anymore, because some of the file names are extremely long, and the program has decided for itself that I must be more interested in the...

    2012-04-19 19:05:24 PDT by t_bugreporter

  • Comment: Various patches for kdiff3 - no iostreams, no RTTI

    Hi Joachim, I attached an additional patch which resolves from VC10 warnings for 32-bit and 64-bit builds. This would bring my branch back in sync with kdiff3 official. - Nigel.

    2012-04-10 20:54:03 PDT by nigels

  • Comment: Various patches for kdiff3 - no iostreams, no RTTI

    Hi Joachim, The Cygwin reasoning looks sound to me, I'll do some testing and follow up soon. - Nigel.

    2012-04-10 20:46:42 PDT by nigels

  • Comment: Various patches for kdiff3 - no iostreams, no RTTI

    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 by joachim99

  • KDiff3

    joachim99 committed revision 157 to the KDiff3 SVN repository, changing 15 files.

    2012-04-10 16:01:50 PDT by joachim99

Our Numbers