kdiff3-user — User questions about KDiff3.

Re: [Kdiff3-user] Contributing and patch application

[Joachim E. <joa...@gm...>]

Hi Patrick,

> Sorry if this is a little off-topic for the -user list but I could not find
> a development channel, please redirect me if there is a better place for
> this discussion.

No problem. For a private discussion you might write to my email as shown on 
the homepage without the "__NO_SPAM__" part.

About your remarks: It is good of you to point them out because I didn't look 
at it that way.

For the README file I applied the patches and noticed that there are more 
things to fix and that's what I did, before I committed the changes.

E.g. the GPL exception was only necessary for Qt3 where for some operating 
systems (Windows) no GPL version was available.

> I suppose the change itself is right, but I did not do it and it should not
> be attributed to me. It is usually accepted to tweak submissions to fix
> typos or whitespace damage but anything beyond this should at least be
> discussed with the submitter. I am perfectly fine with you rejecting my
> patch because of X and Y, talking about them and resubmitting, this is the
> contribution game. That way all what gets in actually comes from me. This
> is not a big deal with the "GPL extension" section I mentioned, but I am a
> little unhappy with...

Completely understandable. I will be more careful about that in the future.

> 3- Why do you comment code instead of removing it?

Because I intended to use it, but then it was not that easy as expected. Yet 
otherwise you are right of course. Probably I should just remove such 
commented out code and rely on version control to fetch it back if needed. I 
wasn't aware that others were looking so closely at my code ;-)

> Both way, it gives a feeling of uncertainty and confusion, it
> seems you do not know where things are going.

The direction is much set by users. If some features or bugs don't make it, 
then just due to lack of time on my side. There are so many things I'd like to 
have in KDiff3 myself and don't get around to do them.

> I hope you do not find these comments too irritating, I really appreciate
> kdiff3 and all the work you put in it, it is one few multiplatform,
> efficient visual diff tools and is pretty important in the source
> control/editing ecosystem. 
Thanks.

> But contributing is a bit difficult and
> unpleasant right now, and I prefer to talk about it rather than moving on.
Yes. I've now activated the git repository on sourceforge will use this in 
future instead of subversion. Perhaps this will help.
If you have any concrete ideas, I'd like to know.

> (Note I did not say a word about sourceforge :-)).
Please give more info about what you mean by that. 

Best regards,
Joachim

[Kdiff3-user] Contributing and patch application

[Patrick M. <pa...@me...>]

Hello Joachim,

Sorry if this is a little off-topic for the -user list but I could not find a development channel, please redirect me if there is a better place for this discussion.

I see you have applied two patches I posted last week and I have several questions about the way you did it:

1- Is there any reason not to apply them separately, with the submitted commit message? The two patches ended in a single revision:

  https://bitbucket.org/pmezard/kdiff3/changeset/a007f2371e51f79487e6234b5fca22bccebab70d

This kind of revisions is very hard to review as it mixes completely unrelated changes. This is sad because as a newcomer I usually take advantage of revision logs to understand what goes where, and what are the coding conventions and other habits of the project, and here the picture is a little messy.


2- I was surprised to see you added non-trivial changes along with my patches. I am fairly sure I did not touched the "GPL exception" section here:

  https://bitbucket.org/pmezard/kdiff3/changeset/a007f2371e51f79487e6234b5fca22bccebab70d#chg_kdiff3/README_oldline67

I suppose the change itself is right, but I did not do it and it should not be attributed to me. It is usually accepted to tweak submissions to fix typos or whitespace damage but anything beyond this should at least be discussed with the submitter. I am perfectly fine with you rejecting my patch because of X and Y, talking about them and resubmitting, this is the contribution game. That way all what gets in actually comes from me. This is not a big deal with the "GPL extension" section I mentioned, but I am a little unhappy with...


3- Why do you comment code instead of removing it?

  https://bitbucket.org/pmezard/kdiff3/changeset/a007f2371e51f79487e6234b5fca22bccebab70d#chg_kdiff3/src-QT4/mergeresultwindow.cpp_oldline3197

First I know I removed this hunk, if you insist on commenting code I would have preferred to discuss the change. And really I would like to understand you approach because this is a bad practice in my book. Kdiff3 codebase is full of these and it gives a bad impression about the project: when you comment full code blocks it usually means either that is a temporary tweak or the code is not really understood and should stay in limbo until things get clearer. Both way, it gives a feeling of uncertainty and confusion, it seems you do not know where things are going.

In this case, the method is unused, it should just disappear not to clutter the code base. And if it happens it is needed again, version control systems, in this case subversion, should be the answer to the problem, not commenting half the code.


I hope you do not find these comments too irritating, I really appreciate kdiff3 and all the work you put in it, it is one few multiplatform, efficient visual diff tools and is pretty important in the source control/editing ecosystem. But contributing is a bit difficult and unpleasant right now, and I prefer to talk about it rather than moving on. (Note I did not say a word about sourceforge :-)).

--
Patrick Mézard

[Kdiff3-user] KDiff3-0.9.97 released

[Joachim E. <joa...@gm...>]

Hi KDiff3 users,

KDiff3-0.9.97 is finally available.

This release focused on these items:
- Improving memory usage when comparing large directories.
- Support for Windows 64 bit version.

In the Windows versions I've now using Qt-DLLs, so it will be easier for those 
interested to build yourself and just replace the KDiff3 binary.

I'm also very happy that there were patches provided by several contributors. 
Thanks a lot! (See details below.)

Mac users: Please volunteer to provide a binary.  (See README file for 
instructions. I might be able to assist via VNC/Skype.)

A note at Ubuntu users regarding the font rendering bug: 
https://bugs.launchpad.net/bugs/999925
For the moment it might be the best idea to enable bitmapped fonts
(https://wiki.ubuntu.com/Fonts#Enabling_Bitmapped_Fonts)
and use e.g. "Fixed [Misc]"
But I will try to fix this soon.

Below follow the details for this version and the checksums.

Best regards,
Joachim


Version 0.9.97 - 2012-08-10
===========================
- Memory usage optimized for comparison of large directories. (ca. 1/5 needed)
- On Windows use config file .kdiff3rc next to kdiff3.exe if exists.
- In overwiev for two way diff show if only one side contains text.
- Fix for Fedora by Neal Becker in src-QT4/kdiff3part.desktop.
- When word wrap is active toggling line numbers now recalculates the word 
wrap.
- Removed confusing "For compatibility ..." hint from option -qall
- Fixed mouse wheel problem. (Patch by David Hay)
- Change an encoding in diff text window via click on encoding label. (Patch 
by Alexey Kostromin)
- Fix for tab-key moving focus instead of adding a tab character in 
MergeResultWindow.
- Workaround for git on Cygwin that allows KDiff3 to find files in a Cygwin 
"/tmp" directory 
  when environment variable "CYGWIN_BIN" is set. (Patch by Nigel Stewart)
- Removed iostream dependency (Patch by Nigel Stewart)
- Regression test framework (by Maurice van der Pot)
- Documentation patch (by Burkard Lueck)
- Select text in Find dialog (by Eike Sauer)
- If text is selected in either input or output window use that in Find 
dialog.
- Added default directory anti patterns ".hg" and ".git" and file anti 
patterns ".rej" and ".bak" for better mercurial and git integration.
- Command line option --cs doesn't change the config value permanently 
anymore.
- On KDE: Not creating a KDiff3Part anymore.
- Windows (Vista or Win 7): Shell context menu in directory comparison view 
now again displays text.
- Windows 64 bit: Diff-Ext-for-KDiff3 context menu now installed as 32 bit and 
64 bit versions to allow other 32 bit programs to use it too.
- Windows 64 bit specific installer.



Checksums:
kdiff3-0.9.97.tar.gz 
SHA1: 1f2828c4b287b905bac64992b46a3e9231319547  kdiff3-0.9.97.tar.gz
MD5:  30a71b474956c369ed7b38c6db080fc4

KDiff3-32bit-Setup_0.9.97.exe
SHA1: 62ecb64a455a43fb5700e81b997ee70bb9264490
MD5:  bc31283fd445de49dc18648cbb01d028

KDiff3-64bit-Setup_0.9.97.exe
SHA1: 6d98a2328360c40577d232a6efc5079b1551f5e8
MD5:  ef4d2b39b88f9e2876aa6c03e333ed88

Re: [Kdiff3-user] Use the "reload" function without changing the current view

[Joachim E. <joa...@gm...>]

Hi Antonio,

Currently this is not possible. Yet it would be a good idea for a future 
version.

Best regards,
Joachim

Am Mittwoch, 8. August 2012, 23:55:39 schrieb Antonio DiCesare:
> Is it possible to reload the files without kdiff3 going back to the first
> line? That is, to reload the files but still keep the current view?
> Sometimes it is annoying to be comparing the final parts of some files,
> make some changes in them, reload the files, and have to restart from the
> beginning.
> 
> Antonio.
> 
> 
> ----------------------------------------------------------------------------
> -- Live Security Virtual Conference
> Exclusive live event will cover all the ways today's security and
> threat landscape has changed and how IT managers can respond. Discussions
> will include endpoint security, mobile security and the latest in malware
> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user

[Kdiff3-user] Use the "reload" function without changing the current view

[Antonio D. <dic...@vo...>]

Is it possible to reload the files without kdiff3 going back to the first line? That is, to reload the files but still keep the current view? Sometimes it is annoying to be comparing the final parts of some files, make some changes in them, reload the files, and have to restart from the beginning.

Antonio.

Re: [Kdiff3-user] List of words to be considered equal

[Joachim E. <joa...@gm...>]

Hi Antonio,

The current method to do this is via a "Line matching preprocessor" in the 
diff-options.

But KDiff3 uses external tools for this: e.g. sed
On Linux sed is a standard tool anyway and on Windows starting with KDiff3 
0.9.96 it is also part of the installation package.

So you can use the command 
sed "s/chapter/paper/g"
which replaces all occurances of "chapter" with "paper" but only during the 
line-matching phase. After that the difference is still highlighted as white 
space which you can also disable via the menu "Diffview" ->"Show white space".

If you have more than one word to replace you can separate the commands with 
semicolon: e.g.
sed "s/first/1/g;s/second/2/g"
(where 's' means substitute and 'g' means global. Without 'g' only the first 
occurance in each line is replaced.)

Best regards,
Joachim


Am Samstag, 28. Juli 2012, 08:26:31 schrieb Antonio DiCesare:
> Is there any way to tell Kdiff3 that two different words in two different
> files have to be treated as equal?
> 
> I use Kdiff3 mainly on LaTeX files and at the moment I'm working on a paper
> that I would also include in a book. So, in the file Paper.tex I have
> sentences like "In this paper…" while in the Book.tex I have "In this
> chapter…". Is it possible to tell Kdiff3 not to highlight a difference when
> it finds "chapter" instead of "paper"?
> 
> Thank you all.
> 
> Antonio.
> 
> 
> ----------------------------------------------------------------------------
> -- Live Security Virtual Conference
> Exclusive live event will cover all the ways today's security and
> threat landscape has changed and how IT managers can respond. Discussions
> will include endpoint security, mobile security and the latest in malware
> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user

[Kdiff3-user] List of words to be considered equal

[Antonio D. <dic...@vo...>]

Is there any way to tell Kdiff3 that two different words in two different files have to be treated as equal?

I use Kdiff3 mainly on LaTeX files and at the moment I'm working on a paper that I would also include in a book. So, in the file Paper.tex I have sentences like "In this paper…" while in the Book.tex I have "In this chapter…". Is it possible to tell Kdiff3 not to highlight a difference when it finds "chapter" instead of "paper"?

Thank you all.

Antonio.

[Kdiff3-user] new command line options

[David W. <da...@ju...>]

For the recently added "Skip directory status report" and "Unfold
subdirectories".

Maybe adding command line options would be too much clutter, but I
often want to keep the old default behavior for normal use and while
always enabling these two features when running kdiff3 from a VCS.
This would be much easier with command line options.

Another possibility is to save, alter, and restore the user
directory diff settings when calling from a VCS, but this would
be clumsy. Is there a better option?

patch attached

-- 
David Wilhelm

Re: [Kdiff3-user] How to merge XML blocks (elements hierarchy)

[Joachim E. <joa...@gm...>]

Hi Inna,

I see: For lines 1 and 4 you can choose, but lines 2,3 and 5 are there only 
once.

There are two possibilities:

The easy and quite straightforward solution is to choose one side e.g. by 
pressing the "A" button for lines 1 and 4. Then select the text from B and 
copy it into the merge output, like in any other text editor.

The second possibility is to use "Join selected diffs" and "Split Diff at 
selection" from the merge menu. ("Selection" again means text selection like 
for copy and paste via the mouse.) But this should be done before doing any 
other merge choices. So you would first join your the five lines from your 
"notes" and if necessary split them from the rest, so that you can then in the 
merge choose A and B to get both.

Best regards,
Joachim


Am Donnerstag, 16. Februar 2012, 13:54:02 schrieb Ginzburg, Inna:
> How to merge XML  blocks (elements hierarchy) ?
> For example: I have 2  elements  in my merge window that came side by
> side as an conflict window A and window B. I want both of  those
> elements in my result one after another. I can't figured out how to do
> it.
> Please advice
> 
> <note to me =1234 >
>    <keyInfo name="NewDate" value="W" />
>     <keyInfo name="RenewDate" value="W" />
>    <keyInfo name="company" value="066" />
> </note>
> 
>     <note to me =123456 >
>    <keyInfo name="NewDate" value="W" />
>     <keyInfo name="RenewDate" value="W" />
>    <keyInfo name="company" value="068" />
> </note>
> 
> 
> 
> 
> Inna

[Kdiff3-user] How to merge XML blocks (elements hierarchy)

[Ginzburg, I. <ig...@al...>]

How to merge XML  blocks (elements hierarchy) ?
For example: I have 2  elements  in my merge window that came side by
side as an conflict window A and window B. I want both of  those
elements in my result one after another. I can't figured out how to do
it. 
Please advice

<note to me =1234 >
   <keyInfo name="NewDate" value="W" />
    <keyInfo name="RenewDate" value="W" />
   <keyInfo name="company" value="066" />
</note>

    <note to me =123456 >
   <keyInfo name="NewDate" value="W" />
    <keyInfo name="RenewDate" value="W" />
   <keyInfo name="company" value="068" />
</note>




Inna

Re: [Kdiff3-user] Exporting reports from KDiff3 (no GUI)

[Joachim E. <joa...@gm...>]

Hi Stephan,

At the moment there is no export of diff results.
If a line by line diff is sufficient then I recommend a command line tool like 
GNU diff or similar. Probably OSX also provides something.

Yes, KDiff3 is based on Qt.

If you want to compile I assume the procedure is similar for Mac as for other 
systems.
- Download and install Qt-version for Mac. (Possibly setup paths)
- cd into the kdiff3/src-QT4 subdir
- qmake kdiff3.pro
- make
But also check this:
http://doc.qt.nokia.com/latest/qmake-platform-notes.html

For exporting:
The data containing the diffs is structured via Diff, DiffList, Diff3Line, 
Diff3LineList (see src-QT4/diff.h).

Joachim

> Dear List,
> 
> I’ve just discovered KDiff3 and I am excited about the quality of the
> results! There’s one question I have, though:
> 
> I plan on using the tool for comparing literary text files (multiple german
> translations of the same english source text) – storing the results to a
> database for visualizations, so I am really interested in the underlying
> data KDiff3 uses to display its resluts (and don’t really want to merge
> the files). Is there a way to get the reports from the command-line
> version in whatever markup format? (XML, text-based etc.) How complicated
> would it be to modify the existing source of the application to export the
> differences without displaying GUI?
> 
> I have just quickly looked into the source code (I only have beginner-level
> C++ skills..) and have failed setting up the KDiff3 project on a Mac to
> compile correctly (from within XCode). Also, I realize the inner workings
> of the KDiff3 app are really dependent on Qt – is that true?
> 
> Thanks for your help!
> 
> Best regards,
> Stephan
> 
> 
> ---------------------
> www.stephanthiel.com

[Kdiff3-user] Exporting reports from KDiff3 (no GUI)

[Stephan T. <ma...@st...>]

Dear List,  

I’ve just discovered KDiff3 and I am excited about the quality of the results!
There’s one question I have, though:

I plan on using the tool for comparing literary text files (multiple german translations of the same english source text) – storing the results to a database for visualizations, so I am really interested in the underlying data KDiff3 uses to display its resluts (and don’t really want to merge the files). Is there a way to get the reports from the command-line version in whatever markup format? (XML, text-based etc.)
How complicated would it be to modify the existing source of the application to export the differences without displaying GUI?

I have just quickly looked into the source code (I only have beginner-level C++ skills..) and have failed setting up the KDiff3 project on a Mac to compile correctly (from within XCode).
Also, I realize the inner workings of the KDiff3 app are really dependent on Qt – is that true?

Thanks for your help!

Best regards,
Stephan


---------------------  
www.stephanthiel.com

Re: [Kdiff3-user] Inserting tab character into embedded editor

[Joachim E. <joa...@gm...>]

Hi Wouter,

Thanks for telling. This is a bug.
I fixed it in SVN revision 147.

For the moment you might copy the tab character from another editor.

Joachim

> Hello,
> 
> 
> 
> Silly question... how do I insert a tab character into the embedded
> 
> editor?
> 
> 
> 
> I'm doing a three-way merge and when I push the "tab" button in the
> 
> editor, the GUI focus shifts away instead of a tab character being
> 
> inserted. I've checked the configuration options and the menu for
> 
> tab-related or external editor settings, but I've not found another way
> 
> except for cut-and-pasting the tab character...
> 
> 
> 
> By the way, thanks for KDiff3 – the visual aspect makes merging a whole
> 
> lot easier and less confusing!
> 
> 
> 
>   Wouter
> 
> 
> 
> ---------------------------------------------------------------------------
> --- Doing More with Less: The Next Generation Virtual Desktop
> What are the key obstacles that have prevented many mid-market businesses
> from deploying virtual desktops?   How do next-generation virtual desktops
> provide companies an easier-to-deploy, easier-to-manage and more affordable
> virtual desktop model.http://www.accelacomm.com/jaw/sfnl/114/51426474/
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user

[Kdiff3-user] Inserting tab character into embedded editor

[Wouter V. H. <wou...@pu...>]

Hello,



Silly question... how do I insert a tab character into the embedded

editor?



I'm doing a three-way merge and when I push the "tab" button in the

editor, the GUI focus shifts away instead of a tab character being

inserted. I've checked the configuration options and the menu for

tab-related or external editor settings, but I've not found another way

except for cut-and-pasting the tab character...



By the way, thanks for KDiff3 – the visual aspect makes merging a whole

lot easier and less confusing!



  Wouter

Re: [Kdiff3-user] KDiff3 sometimes auto resolves merge conflicts, which causes problems

[Joachim E. <joa...@gm...>]

Hi Michael,

Are you *really* sure KDiff3 is being called, when no GUI appears?
Perhaps Git doesn't call KDiff3 on solvable conflicts.

The -qall option does not prevent the GUI from showing. It means that no 
conflicts are solved automatically - even if it would be possible.

Only the -auto option would prevent the GUI if all conflicts are solvable.

Cheers,
Joachim

PS: 
"For compatibility..." means "For compatibility with other tools." as appeared 
in other help lines before, but I wanted keep that line short. Maybe I should 
remove this completely if it's confusing.


> Wed 2011-Sep-07 0832 PDT
> 
> Hello,
> 
> I like the KDiff3 tool for merging changes in source code files (being able
> to choose and edit merge selections is great). One problem that I have,
> though, is that I don't want the tool to automatically resolve merge
> conflicts with Git. I have found that when Git responds that there is a
> merge conflict that it cannot resolve, I invoke KDiff3 as the merge tool
> to manually resolve the conflict. Unfortunately, KDiff3 will sometimes
> resolve the merge conflict without ever bringing up the GUI for me to use.
> I have found that this causes problems with the merge. If Git can't
> resolve the merge conflict then why does KDiff3 do it automatically?)
> 
> I have tried specifying the "--qall" option when configuring Git to use
> KDiff3, but this does not seem to always work. The KDiff3 documentation
> says this about the "--qall" option:
> 
>   --qall              Don't solve conflicts automatically. (For
> compatibility...)
> 
> What does the phrase "For compatibility..." mean?
> 
> Here is how I currently have my global Git configuration for the merge
> tool:
> 
>   [merge]
>           tool = kdiff3
>   [mergetool "kdiff3"]
>           trustExitCode = false
>           cmd = kdiff3 --qall $BASE $LOCAL $REMOTE -o $MERGED
> 
> Is there a way to configure KDiff3 so that it never auto resolves merge
> conflicts?
> 
> 
> Thanks,
> Michael

[Kdiff3-user] KDiff3 sometimes auto resolves merge conflicts, which causes problems

[Michael M. <mlm...@ho...>]

Wed 2011-Sep-07 0832 PDT
 
Hello,
 
I like the KDiff3 tool for merging changes in source code files (being able to choose and edit merge selections is great). One problem that I have, though, is that I don't want the tool to automatically resolve merge conflicts with Git. I have found that when Git responds that there is a merge conflict that it cannot resolve, I invoke KDiff3 as the merge tool to manually resolve the conflict. Unfortunately, KDiff3 will sometimes resolve the merge conflict without ever bringing up the GUI for me to use. I have found that this causes problems with the merge. If Git can't resolve the merge conflict then why does KDiff3 do it automatically?)
 
I have tried specifying the "--qall" option when configuring Git to use KDiff3, but this does not seem to always work. The KDiff3 documentation says this about the "--qall" option:
 
  --qall              Don't solve conflicts automatically. (For compatibility...)
 
What does the phrase "For compatibility..." mean?
 
Here is how I currently have my global Git configuration for the merge tool:
 
  [merge]
          tool = kdiff3
  [mergetool "kdiff3"]
          trustExitCode = false
          cmd = kdiff3 --qall $BASE $LOCAL $REMOTE -o $MERGED
 
Is there a way to configure KDiff3 so that it never auto resolves merge conflicts?
 

Thanks,
Michael 		 	   		  

[Kdiff3-user] Still open problems in v0.9.96

[Ben S. <bxs...@ya...>]

Hello,

glad to see a new version of Kdiff.
However there are still some issues:

1.) In the vertical visual global file diff  overview there is still no color difference between
added, deleted and changed lines. All places are currently marked in red.

2.) For bigger (but not huge) files (> 20 MB) it takes VERY long time for comparison.
Kdiff needs heavy speed improvment

3.) When I drag & drop one file the comparison starts immediately even when the second file is not dragged.
I would appreciate an option "Do not auto-start but wait on icon/menu click"

4.) As far as I can see I still need to pass the location of the config file through cmdline.
Could you make Kdiff3 to search at startup AUTOMATICALLY in its installation directory for a config file
.kdiffrc and if it finds one then use it AUTOMATICALLY?

Could you fix these issues in the next release?

Thank you
Ben

Re: [Kdiff3-user] KDiff3-0.9.96 released

[Neal B. <ndb...@gm...>]

Hi, I maintain kdiff3 for fedora.  I still need this patch, perhaps it can be 
incorporated upstream?

--- src-QT4/kdiff3part.desktop~	2011-08-31 16:29:47.000000000 -0400
+++ src-QT4/kdiff3part.desktop	2011-09-03 10:54:42.965037898 -0400
@@ -37,7 +37,6 @@
 Name[x-test]=xxKDiff3Partxx
 Name[zh_CN]=KDiff3Part
 Name[zh_TW]=KDiff3Part
-MimeType=text/x-diff;
 ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
 X-KDE-Library=libkdiff3part
 Type=Service

[Kdiff3-user] KDiff3-0.9.96 MD5 Sums

[Joachim E. <joa...@gm...>]

d49bf70982bc57a05f1d88951b2f11e2  KDiff3Setup_0.9.96.exe
46b96befddf3448a3cb673f018c6f6f9  kdiff3-0.9.96.tar.gz

[Kdiff3-user] KDiff3-0.9.96 released

[Joachim E. <joa...@gm...>]

Hello KDiff3 users,

After a very long time I'm glad to finally announce a new version of KDiff3.

Several changes for this release are maintenance bugfixes (i.e. making things 
work that used to work before switching the Qt- and KDE-version.)

But several new languages are supported. Thanks to the translators!

Have fun,
Joachim


Version 0.9.96 - 2011-09-02
===========================
- KDiff3FileItemActionPlugin : Context menu that also works in dolphin (for 
KDE>=4.6)
- Parser for preprocessor commands. (Allows single apostrophs ')
- On Windows if the preprocessor command is "sed" try to use a "bin\sed.exe" 
next to the kdiff3.exe, if available.
- Warn if conversion errors appear (Invalid characters)
- Fix crash on A/B-overview (infinite recursion)
- Fix clearcase temp files not deleted problem on windows
- KDiff3 plugin: When launching KDiff3 konqueror isn't blocked anymore
- String corrections (Frederik Schwarzer)
- Fixed writing to KIO.
- OS2-Port (Patch by Silvan Scherrer)
- Fixed problem where destination directory would be renamed or deleted during 
copy operation. 
  Now if the destination directory exists only the files inside will be 
copied.
- In merge: Separate lines where the automatic choice would be the same but 
for different reasons.
- Fixed some problems with huge files in directory comparison mode (>2GB) (but 
direct comparison is still not possible)
- Fixed documentation compile errors with KDE>=4.5
- Fixed white space merge default options
- Fixed regexp test tool.
- Exclude printing code if Qt was compiled without printing support.
- For Windows: Fixed handling of unicode characters in command line 
parameters.
- Improved "old mac" lineendstyle handling: Break lines.
- Detect encoding specified in xml header or html "meta" tag. 

Re: [Kdiff3-user] FW: Re: display problem under windows7

[Joachim E. <joa...@gm...>]

Hi Florian,

As I see from the screenshot this is not about encoding, but about correct 
window update.

What exactly did you do before the problem appears (scrolling or jumping to 
that place directly)? Does it go away if you do scroll up or down a complete 
page?

As I see some lines are italic, but some are not. Which font are you using? If 
you are using italic for differences or generally, does it help if you switch 
to a normal font? 

Perhaps you could please send me the .kdiff3rc-file from your user directory.

Joachim


> Sorry guys, I guess I made an error in sending the screenshot to the
> mailing list... 
> please find attached the screenshot you were asking for.
>  
> As I am not on my personal PC at the moment, I will check the encoding
> settings next week. 
> Thanks
>  
> 
> 
> ----- Ursprüngliche Nachricht -----
> Von: Florian Mader
> Gesendet: 21.06.11 13:42 Uhr
> An: kdi...@li...
> Betreff: Re: [Kdiff3-user] display problem under windows7
> 
> 
> 
>  
> this is the reduzable behavior of KDiff3 ...
>  
> the first screenshot shows how KDiff3 draw the sourcecode firstly,
>  
> the second screenshot shows how it should look like and how KDiff draw the
> screen corretly after minimizing and reopening the programm to the task
> bar. 
>  
> 
> ----- Ursprüngliche Nachricht -----
> Von: Florian Mader
> Gesendet: 21.06.11 11:12 Uhr
> An: kdi...@li...
> Betreff: [Kdiff3-user] display problem under windows7
> 
> 
> 
>  
> Hi folks,
>  
> - Windows 7 SP1
> - KDiff 0.9.95 Setup: KDiff3-9.9.95-2_Septup.exe
>  
> Kdiff3 cannot show correctly a diff of two text or code files running under
> windows7 ... 
> The same files do not cause an error under windows xp ...
>  
> is therer any bugix planned or a workaround avialable?
>  
> Thanks

Re: [Kdiff3-user] display problem under windows7

[Joachim E. <joa...@gm...>]

Hi,

I can't reproduce your problem on Win7/64 Bit.
Does anyone else have this problem?

Please give more details.
Which encoding are you using? (See regional settings.)
Does it match the encoding of your files?

Perhaps you can send a screenshot and/or example files?

Joachim



> Hi folks,
>  
> - Windows 7 SP1
> - KDiff 0.9.95 Setup: KDiff3-9.9.95-2_Septup.exe
>  
> Kdiff3 cannot show correctly a diff of two text or code files running under
> windows7 ... 
> The same files do not cause an error under windows xp ...
>  
> is therer any bugix planned or a workaround avialable?
>  
> Thanks

[Kdiff3-user] display problem under windows7

[Florian M. <fl...@ma...>]

Hi folks, 
- Windows 7 SP1
- KDiff 0.9.95 Setup: KDiff3-9.9.95-2_Septup.exe
Kdiff3 cannot show correctly a diff of two text or code files running under windows7 ... 
The same files do not cause an error under windows xp ... 
is therer any bugix planned or a workaround avialable?
Thanks 
flo_rob

Re: [Kdiff3-user] kdiff3 Ver 0.9.95 stack buffer overrun

[Yang T. <yan...@gm...>]

2011/5/2 Joachim Eibl wrote:

> Now I can see the lower KDiff3-part of the stack. But the upper
> kernel32-part is probably not correct yet.
>
> If you also want to fix that, use Windbg again and set this as a symbolpath:
>
> SRV*c:\symbols*http://msdl.microsoft.com/download/symbols
>
> Windbg will load Microsoft pdb-files from the net into your local directory
>
> c:\symbols which should be created first. The kdiff3-part will be unclear to
> Windbg again though.

Yes, the windbg does not show the mingw debug info. I'm inlining the
windbg backtrace for the first kdiff3 you provided with debug info in
case you are yet interested in it. More comments after this
backtrace...

------8<------8<------8<------8<------8<------8<------8<------8<------8<
Microsoft (R) Windows Debugger Version 6.12.0002.633 X86
Copyright (c) Microsoft Corporation. All rights reserved.

CommandLine: C:\kdiff3_1\kdiff3.exe
Symbol search path is:
SRV*c:\websymbols*http://msdl.microsoft.com/download/symbols
Executable search path is:
ModLoad: 00400000 01bf4000   image00400000
ModLoad: 7c910000 7c9c8000   ntdll.dll
ModLoad: 7c800000 7c903000   C:\WINDOWS\system32\kernel32.dll
ModLoad: 64d00000 64d33000   C:\Archivos de programa\Alwil
Software\Avast5\snxhk.dll
ModLoad: 77da0000 77e4c000   C:\WINDOWS\system32\ADVAPI32.DLL
ModLoad: 77e50000 77ee3000   C:\WINDOWS\system32\RPCRT4.dll
ModLoad: 77fc0000 77fd1000   C:\WINDOWS\system32\Secur32.dll
ModLoad: 76360000 763aa000   C:\WINDOWS\system32\COMDLG32.DLL
ModLoad: 58c30000 58cca000   C:\WINDOWS\system32\COMCTL32.dll
ModLoad: 77ef0000 77f39000   C:\WINDOWS\system32\GDI32.dll
ModLoad: 7e390000 7e421000   C:\WINDOWS\system32\USER32.dll
ModLoad: 7e6a0000 7eec1000   C:\WINDOWS\system32\SHELL32.dll
ModLoad: 77be0000 77c38000   C:\WINDOWS\system32\msvcrt.dll
ModLoad: 77f40000 77fb6000   C:\WINDOWS\system32\SHLWAPI.dll
ModLoad: 76340000 7635d000   C:\WINDOWS\system32\IMM32.DLL
ModLoad: 774b0000 775ee000   C:\WINDOWS\system32\OLE32.dll
ModLoad: 770f0000 7717b000   C:\WINDOWS\system32\OLEAUT32.DLL
ModLoad: 76b00000 76b2e000   C:\WINDOWS\system32\WINMM.DLL
ModLoad: 72f80000 72fa6000   C:\WINDOWS\system32\WINSPOOL.DRV
ModLoad: 71a30000 71a47000   C:\WINDOWS\system32\WS2_32.DLL
ModLoad: 71a20000 71a28000   C:\WINDOWS\system32\WS2HELP.dll
ModLoad: 6e940000 6e950000   C:\kdiff3_1\libgcc_s_dw2-1.dll
(a78.eb0): Break instruction exception - code 80000003 (first chance)
eax=00351ea4 ebx=7ffd6000 ecx=00000001 edx=00000002 esi=00351f18 edi=00351ea4
eip=7c91120e esp=0022fb20 ebp=0022fc94 iopl=0         nv up ei pl nz na po nc
cs=001b  ss=0023  ds=0023  es=0023  fs=003b  gs=0000             efl=00000202
ntdll!DbgBreakPoint:
7c91120e cc              int     3
0:000> g
ModLoad: 773a0000 774a3000
C:\WINDOWS\WinSxS\x86_Microsoft.Windows.Common-Controls_6595b64144ccf1df_6.0.2600.6028_x-ww_61e65202\comctl32.dll
ModLoad: 76630000 766e5000   C:\WINDOWS\system32\userenv.dll
ModLoad: 5b150000 5b188000   C:\WINDOWS\system32\uxtheme.dll
ModLoad: 02790000 02a66000   C:\WINDOWS\system32\xpsp2res.dll
ModLoad: 76310000 76320000   C:\WINDOWS\system32\winsta.dll
ModLoad: 597f0000 59845000   C:\WINDOWS\system32\NETAPI32.dll
(a78.eb0): Unknown exception - code 000006ba (first chance)
ModLoad: 76f90000 7700f000   C:\WINDOWS\system32\CLBCATQ.DLL
ModLoad: 77010000 770e0000   C:\WINDOWS\system32\COMRes.dll
ModLoad: 77bd0000 77bd8000   C:\WINDOWS\system32\VERSION.dll
ModLoad: 7e210000 7e383000   C:\WINDOWS\system32\shdocvw.dll
ModLoad: 77a50000 77ae6000   C:\WINDOWS\system32\CRYPT32.dll
ModLoad: 77af0000 77b02000   C:\WINDOWS\system32\MSASN1.dll
ModLoad: 76890000 76914000   C:\WINDOWS\system32\CRYPTUI.dll
ModLoad: 597f0000 59845000   C:\WINDOWS\system32\NETAPI32.dll
ModLoad: 77180000 7722b000   C:\WINDOWS\system32\WININET.dll
ModLoad: 76bf0000 76c1e000   C:\WINDOWS\system32\WINTRUST.dll
ModLoad: 76c50000 76c78000   C:\WINDOWS\system32\IMAGEHLP.dll
ModLoad: 76f20000 76f4d000   C:\WINDOWS\system32\WLDAP32.dll
ModLoad: 74dc0000 74e2d000   C:\WINDOWS\system32\RichEd20.dll
ModLoad: 77b10000 77b32000   C:\WINDOWS\system32\appHelp.dll
ModLoad: 64e40000 64e62000   C:\Archivos de programa\Alwil
Software\Avast5\ashShell.dll
ModLoad: 66080000 6609a000   C:\ARCHIV~1\ALWILS~1\Avast5\3082\Base.dll
ModLoad: 7d1f0000 7d4ac000   C:\WINDOWS\system32\msi.dll
ModLoad: 779f0000 77a45000   C:\WINDOWS\System32\cscui.dll
ModLoad: 765b0000 765cd000   C:\WINDOWS\System32\CSCDLL.dll
ModLoad: 75f30000 7602d000   C:\WINDOWS\system32\browseui.dll
ModLoad: 778f0000 779e7000   C:\WINDOWS\system32\SETUPAPI.dll
ModLoad: 71aa0000 71ab2000   C:\WINDOWS\system32\MPR.dll
ModLoad: 75f10000 75f17000   C:\WINDOWS\System32\drprov.dll
ModLoad: 71bb0000 71bbe000   C:\WINDOWS\System32\ntlanman.dll
ModLoad: 71c70000 71c87000   C:\WINDOWS\System32\NETUI0.dll
ModLoad: 71c30000 71c70000   C:\WINDOWS\System32\NETUI1.dll
ModLoad: 71c20000 71c27000   C:\WINDOWS\System32\NETRAP.dll
ModLoad: 71b90000 71ba3000   C:\WINDOWS\System32\SAMLIB.dll
ModLoad: 75f20000 75f2a000   C:\WINDOWS\System32\davclnt.dll
ModLoad: 16210000 1648e000   C:\WINDOWS\system32\wpdshext.dll
ModLoad: 4eba0000 4ed4b000
C:\WINDOWS\WinSxS\x86_Microsoft.Windows.GdiPlus_6595b64144ccf1df_1.0.6002.22509_x-ww_c7dad023\gdiplus.dll
ModLoad: 10930000 10979000   C:\WINDOWS\system32\PortableDeviceApi.dll
ModLoad: 73cf0000 73d03000   C:\WINDOWS\system32\shgina.dll
ModLoad: 75920000 75a19000   C:\WINDOWS\system32\MSGINA.dll
ModLoad: 745e0000 7461d000   C:\WINDOWS\system32\ODBC32.dll
ModLoad: 76310000 76320000   C:\WINDOWS\system32\WINSTA.dll
ModLoad: 1f840000 1f858000   C:\WINDOWS\system32\odbcint.dll
(a78.2a0): Unknown exception - code 000006ba (first chance)
ModLoad: 76940000 76948000   C:\WINDOWS\system32\LINKINFO.dll
ModLoad: 76950000 76976000   C:\WINDOWS\system32\ntshrui.dll
ModLoad: 76ae0000 76af1000   C:\WINDOWS\system32\ATL.DLL
(a78.2a0): Unknown exception - code 000006ba (first chance)
ModLoad: 07160000 071a6000   C:\WINDOWS\system32\Audiodev.dll
ModLoad: 15110000 1536d000   C:\WINDOWS\system32\WMVCore.DLL
ModLoad: 11c70000 11caa000   C:\WINDOWS\system32\WMASF.DLL
ModLoad: 16210000 1648e000   C:\WINDOWS\system32\wpdshext.dll
ModLoad: 4eba0000 4ed4b000
C:\WINDOWS\WinSxS\x86_Microsoft.Windows.GdiPlus_6595b64144ccf1df_1.0.6002.22509_x-ww_c7dad023\gdiplus.dll
ModLoad: 73cf0000 73d03000   C:\WINDOWS\system32\shgina.dll
(a78.2a0): Unknown exception - code 000006ba (first chance)
ModLoad: 07160000 071a6000   C:\WINDOWS\system32\Audiodev.dll
ModLoad: 15110000 1536d000   C:\WINDOWS\system32\WMVCore.DLL
ModLoad: 11c70000 11caa000   C:\WINDOWS\system32\WMASF.DLL


 *** A stack buffer overrun occurred in C:\kdiff3_1\kdiff3.exe:

This is usually the result of a memory copy to a local buffer or
structure where the size is not properly calculated/checked.
If this bug ends up in the shipping product, it could be a severe security hole.
The stack trace should show the guilty function (the function directly
above __report_gsfailure).
 *** enter .exr 0022E9D0 for the exception record
 *** then kb to get the faulting stack

(a78.eb0): Break instruction exception - code 80000003 (first chance)
eax=00000000 ebx=00020648 ecx=7c978568 edx=0022e75b esi=00000001 edi=0022ecf8
eip=7c91120e esp=0022e974 ebp=0022e9b0 iopl=0         nv up ei pl zr na pe nc
cs=001b  ss=0023  ds=0023  es=0023  fs=003b  gs=0000             efl=00200246
ntdll!DbgBreakPoint:
7c91120e cc              int     3
0:000> .exr 0022E9D0
ExceptionAddress: 7c85a6f2 (kernel32!FindRegTziForCurrentYear+0x000001a5)
   ExceptionCode: c0000409 (Stack buffer overflow)
  ExceptionFlags: 00000000
NumberParameters: 0
0:000> kb
ChildEBP RetAddr  Args to Child
0022e970 7c977ede 0022ea20 00000001 0022f6f0 ntdll!DbgBreakPoint
0022e9b0 7c9785f1 0022ecf8 7c9785f6 0022ed00
ntdll!RtlUnhandledExceptionFilter2+0x27b
0022e9c0 7c870ef6 0022ecf8 00000001 c0000409
ntdll!RtlUnhandledExceptionFilter+0x12
0022ed00 7c85a6f2 00000000 00000024 7c85a6f8 kernel32!__report_gsfailure+0xda
0022ef90 7c85a788 0022efa8 0022f008 0000c2e3
kernel32!FindRegTziForCurrentYear+0x1a5
0022efd4 7c85a7bd 0022f008 0000c2e3 0022f25c
kernel32!CheckDynamicTimeZoneInformation+0x29
0022efec 7c85a834 0022f008 0000c2e3 0022f25c
kernel32!GetDynamicTimeZoneInfoForTimeZone+0x17
0022f214 7c83b11c 0000c2e3 00000000 0022f25c
kernel32!GetTimeZoneInformationForYear+0x58
*** ERROR: Module load completed but symbols could not be loaded for
image00400000
0022f3b8 00b340ca 00000000 0022f3f8 0022f3e8
kernel32!SystemTimeToTzSpecificLocalTime+0x3c
WARNING: Stack unwind information not available. Following frames may be wrong.
0022f428 00b3651d 023ba218 00000000 0022f6ac image00400000+0x7340ca
0022f728 00af6639 0022f75c 0245a858 00000000 image00400000+0x73651d
0022f778 00af6799 024751b8 00000000 0022ffe0 image00400000+0x6f6639
0022f798 00461d44 0022f844 0022f818 00000004 image00400000+0x6f6799
0022f8a8 00460e0d 0022f8f8 0022fa04 00000000 image00400000+0x61d44
0022f8d8 00405108 0022f8f8 0022fa04 00000000 image00400000+0x60e0d
0022f948 0044608d 0238e858 0022fa04 0022f9fc image00400000+0x5108
0022fa68 00418525 0238e6e0 00000001 0238e840 image00400000+0x4608d
0022fb68 0047429b 0238e6e0 0022fbb4 0022fbb0 image00400000+0x18525
0022fbd8 00404803 023812d0 00000001 0022fc14 image00400000+0x7429b
0022feb8 0048a4cf 00000001 02204460 02204428 image00400000+0x4803
0022fef8 0048a198 00400000 00000000 0025236e image00400000+0x8a4cf
0022ff78 0040124b 00000001 02202790 022029f0 image00400000+0x8a198
0022ffb0 004012b8 00000002 00000009 0022fff0 image00400000+0x124b
0022ffc0 7c817077 0150f6ee 0150f736 7ffd6000 image00400000+0x12b8
0022fff0 00000000 004012a0 00000000 78746341 kernel32!BaseProcessStart+0x23
------8<------8<------8<------8<------8<------8<------8<------8<------8<

It seems there's some problem related with UTC/local time conversion.

> Nevertheless I think, that the only way to avoid the problem would be
> not to query the time unless really needed. The bug seems to be in the
> Windows-XP-dlls or in your specific environment.

Certainly the change you introduced, postponing date retrieval, seems
to have fixed the issue given that the last version you provided does
not exhibit the problem previous version had.

I don't know if it is actually a MS-dll problem, a
configuration/corruption problem, or whatever else. What I know is
that the last change you've introduced fixes the issue I was able to
reproduce on to different XP boxes.

Thanks a lot.

Looking forward to next kdiff3 release
-- 
-=[Yang]=-

Re: [Kdiff3-user] kdiff3 Ver 0.9.95 stack buffer overrun

[Joachim E. <joa...@gm...>]

Hi,

Thank you for the backtrace.
Now I can see the lower KDiff3-part of the stack. But the upper kernel32-part 
is probably not correct yet.

If you also want to fix that, use Windbg again and set this as a symbolpath: 
SRV*c:\symbols*http://msdl.microsoft.com/download/symbols

Windbg will load Microsoft pdb-files from the net into your local directory 
c:\symbols which should be created first. The kdiff3-part will be unclear to 
Windbg again though.

Nevertheless I think, that the only way to avoid the problem would be not to 
query the time unless really needed. The bug seems to be in the Windows-XP-
dlls or in your specific environment.

Because the times are not really needed at that point, I made a change that 
might fix the problem for you. Please test:
http://kdiff3.sourceforge.net/kdiff3_2.zip

Joachim

> Hi,
> 
> 2011/5/1 Joachim Eibl wrote:
> > http://kdiff3.sourceforge.net/kdiff3.zip
> > 
> > contains the most recent version from svn trunk (which is about to be
> > released soon), statically linked against Qt4.7.2.
> 
> Program requires libgcc_s_dw2-1.dll, I managed to provide a copy locally.
> 
> > For the start you can test if the problem is reproducable.
> 
> Yes, the problem is still here, when comparing directories F:/ and G:/
> 
> > If yes, then it is probably best just to let it crash while running from
> > gdb and send me the stack.
> 
> gdb session and crash backtrace follows...
> 
> --------8<--------8<--------8<--------8<--------8<--------8<--------8<-----
> ---
> 
> C:\kdiff3>gdb kdiff3.exe
> GNU gdb (GDB) 7.2
> Copyright (C) 2010 Free Software Foundation, Inc.
> License GPLv3+: GNU GPL version 3 or later
> <http://gnu.org/licenses/gpl.html> This is free software: you are free to
> change and redistribute it. There is NO WARRANTY, to the extent permitted
> by law.  Type "show copying" and "show warranty" for details.
> This GDB was configured as "i686-pc-mingw32".
> For bug reporting instructions, please see:
> <http://www.gnu.org/software/gdb/bugs/>.
> Reading symbols from C:\kdiff3/kdiff3.exe...done.
> (gdb) run
> Starting program: C:\kdiff3/kdiff3.exe
> [New Thread 156.0xf5c]
> warning: BTMMHOOK 02.05.2011 03:35:46 Thread<0F5C> Hook DLL loaded
> 
> [New Thread 156.0xc60]
> [New Thread 156.0xe8c]
> [New Thread 156.0x7e8]
> [New Thread 156.0x968]
> [New Thread 156.0x164]
> [New Thread 156.0xfd8]
> [New Thread 156.0x534]
> BFD: C:\WINDOWS\system32\WMVCore.dll: Warning: Ignoring section flag
> IMAGE_SCN_M EM_NOT_PAGED in section .reloc
> [New Thread 156.0xe6c]
> BFD: C:\WINDOWS\system32\WMVCore.dll: Warning: Ignoring section flag
> IMAGE_SCN_M EM_NOT_PAGED in section .reloc
> warning:
> 
>  *** A stack buffer overrun occurred in C:\kdiff3/kdiff3.exe :
> 
> 
> warning: This is usually the result of a memory copy to a local buffer or
> struct ure where the size is not properly calculated/checked.
> 
> warning: If this bug ends up in the shipping product, it could be a severe
> secur ity hole.
> 
> warning: The stack trace should show the guilty function (the function
> directly above __report_gsfailure).
> 
> warning:  *** enter .exr 0022E9D0 for the exception record
> 
> warning:  *** then kb to get the faulting stack
> 
> 
> 
> Program received signal SIGTRAP, Trace/breakpoint trap.
> 0x7c91120f in ntdll!DbgUiConnectToDbg () from C:\WINDOWS\system32\ntdll.dll
> (gdb) bt
> #0  0x7c91120f in ntdll!DbgUiConnectToDbg ()
>    from C:\WINDOWS\system32\ntdll.dll
> #1  0x7c977ede in ntdll!RtlUnhandledExceptionFilter2 ()
>    from C:\WINDOWS\system32\ntdll.dll
> #2  0x0022ea20 in ?? ()
> #3  0x7c9785f1 in ntdll!RtlUnicodeStringToAnsiSize ()
>    from C:\WINDOWS\system32\ntdll.dll
> #4  0x7c870ef6 in KERNEL32!BeginUpdateResourceA ()
>    from C:\WINDOWS\system32\kernel32.dll
> #5  0x7c85a6f2 in SetClientTimeZoneInformation ()
>    from C:\WINDOWS\system32\kernel32.dll
> #6  0x7c85a788 in SetClientTimeZoneInformation ()
>    from C:\WINDOWS\system32\kernel32.dll
> #7  0x7c85a7bd in SetClientTimeZoneInformation ()
>    from C:\WINDOWS\system32\kernel32.dll
> #8  0x7c85a834 in SetClientTimeZoneInformation ()
>    from C:\WINDOWS\system32\kernel32.dll
> #9  0x7c83b11c in ValidateLocale () from C:\WINDOWS\system32\kernel32.dll
> #10 0x00b340ca in fileTimeToQDateTime(_FILETIME const*) ()
> #11 0x00b3651d in QFSFileEngine::fileTime(QAbstractFileEngine::FileTime)
> const ()
> #12 0x00af6639 in
> QFileInfoPrivate::getFileTime(QAbstractFileEngine::FileTime) c onst ()
> #13 0x00af6799 in QFileInfo::created() const ()
> #14 0x00461d44 in FileAccess::setFile (this=0x22f8f8, name=...,
>     bWantToWrite=false) at fileaccess.cpp:138
> #15 0x00460e0d in FileAccess::FileAccess (this=0x22f8f8, name=...,
>     bWantToWrite=false) at fileaccess.cpp:55
> #16 0x00405108 in SourceData::setFilename (this=0x2343b80, filename=...)
>     at diff.cpp:187
> #17 0x0044608d in KDiff3App::slotFileOpen (this=0x2343a08) at
> pdiff.cpp:1101 #18 0x00418525 in KDiff3App::completeInit (this=0x2343a08,
> fn1=..., fn2=..., fn3=...) at kdiff3.cpp:454
> #19 0x0047429b in KDiff3Shell::KDiff3Shell (this=0x2324f90,
>     bCompleteInit=true) at kdiff3_shell.cpp:69
> #20 0x00404803 in qMain (argc=1, argv=0x21a2430) at main.cpp:249
> #21 0x0048a4cf in WinMain@16 ()
> #22 0x0048a198 in main ()
> (gdb)
> 
> --------8<--------8<--------8<--------8<--------8<--------8<--------8<-----
> ---
> 
> HTH