-
There was a bug which should be fixed in newer version (e.g. 0.9.95).
Sorry for the inconvenience.
Please report if the problem still exists in 0.9.95.
Joachim.
2009-10-08 08:58:51 UTC in KDiff3
-
Note: Alt-RM is meant as replacement for Alt+R and <down>. Both will probably only work for KDiff3 in English because they are shortcuts for keyboard navigation in the menu. For other languages check which letters are underlined in the menu.
2009-09-08 14:14:18 UTC in KDiff3
-
As I understand there are two problems:
- to switch the focus back to the directory tree view: Use Alt-Left or Alt-Right arrow to switch the focus between the different input areas. If Ctrl-Tab is not used by the system it might also work. Note that when the focus is in the directory tree this is almost not visible. But up/down keys have an effect.
- to start a merge. There is indeed no...
2009-09-08 14:05:44 UTC in KDiff3
-
You can disable the highlighting of white space changes via the menu "Diff view"->"Show white space". If this is not enough you might want to check the diff-options where you can select to "ignore numbers" etc. More sophisticated suppression of differences is possible by using a preprocessor. Please see the KDiff3-documentation for that.
Cheers,
Joachim.
2009-09-02 07:06:23 UTC in KDiff3
-
Hi Niclas,
This should be possible without any change within KDiff3.
Just as you say: Assign Y.5 as A (Base), Y.6 as B and Z.latest as C.
Since during a merge KDiff3 just processes text all that counts are the differences to the specified base A, not if it is a real common base.
If KDiff3 usually gets called from a version control, you must probably avoid this for such a case and specify the...
2009-06-24 19:46:34 UTC in KDiff3
-
The README is quite up to date.
Perhaps it's easiest to use the new QtCreator:
http://get.qtsoftware.com/qtsdk/qt-sdk-win-opensource-2009.02.exe
and open the project file src-QT4\kdiff3.pro
Because the mingw-version shipped in the sdk contains an old win32api you also need a newer version such as...
2009-05-14 20:35:21 UTC in KDiff3
-
Hi,
Seems to be a windows problem. I had no problem on Linux. On windows I can't even copy your japanese characters on the command line.
At the moment I have no idea how to help. I can save a bat file with these characters as utf8 but it won't execute correctly.
Joachim.
2009-05-13 19:43:11 UTC in KDiff3
-
Hi Malcolm,
If you need a guarantee, then I'm sorry that I can't provide it. To my knowledge there exists no merge algorithm that can give guarantees that an automatic merge always gives you the correct result. But there are some tools that warn the user if a change from one branch is "near" the change of another branch.
Nevertheless in the long time I'm using KDiff3 I very rarely came...
2009-04-30 20:54:05 UTC in KDiff3
-
joachim99 added the kdiff3-0.9.95-Mac-Universal-2.zip file.
2009-03-22 14:21:00 UTC in KDiff3
-
Hi,
I tested on OpenSuse 11.1 but I can't reproduce the problem. It work for me.
Did you first click into the view, where you wanted to paste?
The view needs focus first.
Joachim.
2009-03-12 19:20:36 UTC in KDiff3
