I know this is a bit far-fetched: does anyone know a 5-way folder-compare/merge?...
Hi Cor'e=), You might want to read some docs. Especially: http://kdiff3.sourceforge.net/doc/dirmergevisible.html...
I've been using WinMerge for many many years for everything, but work has upgraded...
I've been using WinMerge for many many years for everything, but work has upgraded...
Title typo: ... nice to see ..., guess this should have been posted in Feature Requests,...
Title typo: ... nice to see ..., guess this should have been posted in Feature Requests,...
Title typo: ... nice to see ...
[Feature Request] It would be noice to see the the tree grow as the comparison progresses...
Can't Minimize GUI during comparison...
or run. (Can't edit my original bug reports - see your SF settings?).
GUI Window tilte not updating to current open comp[arisons...
Adding .PNG attachment.
(Darn, can't delete Posts either ...). Appears to be a "Line and End Style" conflict,...
(Darn, can't delete Posts either ...). Appears to be a "Line and End Style" conflict,...
appears to be a "Line and End Style" conflict.
typos: ... (the context feature to do so appears to be broken) the GUI displays the...
Cannot get a 0 byte file to copy to/from directory(ies)...
Hmmm, can't edit bug reports for some reason... Ok, to be clear, all columns when...
Hmmm, can't edit bug reports for some reason... Ok, to be clear, all columns when...
GUI Columns won't sort...
GUI Comparison Status Bar says 0% always
Hi KDiff3 forum people, i'm new to KDiff3's GUI, i've worked with WinMerge so long...
Hi KDiff3 forum people, i'm new to KDiff3's GUI, i've worked with WinMerge so long...
Hi KDiff3 forum people, i'm new to KDiff3's GUI, i've worked with WinMerge so long...
Hi KDiff3 forum people, i'm new to KDiff3's GUI, i've worked with WinMerge so long...
Hi KDiff3 forum people, i'm new to KDiff3's GUI, i've worked with WinMerge so long...
Hi KDiff3 forum people, i'm new to KDiff3's GUI, i've worked with WinMerge so long...
Hi KDiff3 forum people, i'm new to KDiff3's GUI, i've worked with WinMerge so long...
Hi KDiff3 forum people, i'm new to KDiff3's GUI, i've worked with WinMerge so long...
Hi KDiff3 forum people, i'm new to KDiff3's GUI, i've worked with WinMerge so long...
Hi KDiff3 forum people, i'm new to KDiff3's GUI, i've worked with WinMerge so long...
Hi KDiff3 forum people, i'm new to KDiff3's GUI, i've worked with WinMerge so long...
Hi KDiff3 forum people, i'm new to KDiff3's GUI, i've worked with WinMerge so long...
Hi KDiff3 forum people, i'm new to KDiff3's GUI, i've worked with WinMerge so long...
Hi KDiff3 forum people, i'm new to KDiff3's GUI, i've worked with WinMerge so long...
I've been using WinMerge for many many years for everything, but work has upgraded...
I've been using WinMerge for many many years for everything, but work has upgraded...
Open selected file / parent folder. Compare two non-identically named/located files in a folder merge
Whitespace color should be different
Preprocessor input corrupted by convertFileEncoding?
[bug] Fails to show diff between versions of a renamed file
+1
kdiff3 ignores context during 3-way merges
KDiff3 0.9.98-2 x64: missing libgcc_s_seh-1.dll
No, this is not enough. As I wrote, I use KDiff3 for texts pasted from the clipboard....
Looks like 0.9.95 is the last version that excluded this problem. I will switch back...
Yes, I broke that by trying to fix issues with old Mac line endings (0D) and converting...
I have found that 0.9.96 and 0.9.97 exhibit the same problem. But 0.9.96a delivered...
Corruption when merging some Chinese characters in Unicode files.
FYI, the actual Chinese characters - 請稍待 becomes 請稊待
Corruption when merging some Chinese characters in Unicode files.
BOM-less UTF8 cannot be detected
By default the "Auto Detect Unicode" only works for UTF8 files with BOM. More precision...
By default the "Auto Detect Unicode" only works for UTF8 files with BOM. More precision...
I started work on this: https://github.com/NullVoxPopuli/kdiff3/tree/optionally-fail-on-conflict...
Optional param for --auto that exits silently in the event of unsolvable conflicts
Variable substitution in preprocessor commands
KDiff3 aligns lines that are the same or that differ only in whitespace. From line...
btw, I forgot to attach the file, so here it is.
-NoOpenDialog param
hide startup selecting file dialog
I've also had this problem after updating to the new versions - both with KDiff3-32bit-Setup_0.9.98-3.exe...
I've also had this problem after updating to the new versions - both with KDiff3-32bit-Setup_0.9.98-3.exe...
I've also had this problem after updating to the new versions - both with KDiff3-32bit-Setup_0.9.98-3.exe...
I've also had this problem after updating to the new versions - both with KDiff3-32bit-Setup_0.9.98-3.exe...
I've also had this problem after updating to the new versions - both with KDiff3-32bit-Setup_0.9.98-3.exe...
Thanks, Joachim! :) Do you have any estimate of approximately how long it might be...
I've made the "Number of unresolved conflicts" message persistant (see git-head)....
Merge branch 'HEAD' of https://joachim99@git.co...
Make status message "Number of remaining unreso...
Diff summaries for use outside of Kdiff3
Well done!
OK, it wasn't too hard after all. I came up with this preprocessor line perl -e 'print...
Hi, Can I suggest a new feature for Kdiff, unless there is already a program out...
Merge branch 'HEAD' of ssh://joachim99@git.code...
Merge branch 'master' of ssh://git.code.sf.net/...
Fix KDE4 build on Ubuntu: export QT_SELECT=4
- Fixed compilation for KDE
Fix compilation for KDE4.
- Fixed progressbar when comparing directories
So, any conclusion, progress, or plan on this? I occasionally wish a better support...
So, and conclusion, progress, or plan on this? I occasionally wish a better support...
on Windows, kdiff3 prepends home dir to URL of file to compare
Merge commit '3fd9098c6986a8c186a6989bbba011783...
Also, it's works if I copy KDiff3 folder (unmodified) from Program Files to my folder....
Yes, removing Prefix helps
Asign shortcut keys to split diff/join diffs functions
Update: I found that with block merging and splitting I can merge many such cases...
Allow removing single manual alignment point
Preserve position when setting or clearing manual alignment points
Please reject this merge request. It's the same as the one before.
Don't know what happened to this request. 0 commits? Not what I had in mind. Hang...
Don't know what happened to this request. 0 commmits? Not what I had in mind. Hang...
Fix translations for Qt5.
Please check: - There should be the qt.conf file next to the kdiff3.exe containing...
If the problem persists after reboot: The bin-folder contains several dlls. Copy...
Windows 8.1 64-bit. Maybe problem only appear on WIndows 8.1. On my work machine...
The manifest file tells Windows where to look for the dlls. But I am aware that there...
Somehow it's works on my work computer.