-
 KDE-Apps.org Applications for the KDE-Desktop 
 GTK-Apps.org Applications using the GTK Toolkit 
 GnomeFiles.org Applications for GNOME 
 MeeGo-Central.org Applications for MeeGo 
 CLI-Apps.org Command Line Applications 
 Qt-Apps.org Free Qt Applications 
 Qt-Prop.org Proprietary Qt Applications 
 Maemo-Apps.org Applications for the Maemo Plattform 
 Java-Apps.org Free Java Applications 
 eyeOS-Apps.org Free eyeOS Applications 
 Wine-Apps.org Wine Applications 
 Server-Apps.org Server Applications 
 apps.ownCloud.com ownCloud Applications 
--
-
 KDE-Look.org Artwork for the KDE-Desktop 
 GNOME-Look.org Artwork for the GNOME-Desktop 
 Xfce-Look.org Artwork for the Xfce-Desktop 
 Box-Look.org Artwork for your Windowmanager 
 E17-Stuff.org Artwork for Enlightenment 
 Beryl-Themes.org Artwork for the Beryl Windowmanager 
 Compiz-Themes.org Artwork for the Compiz Windowmanager 
 EDE-Look.org Themes for your EDE Desktop 
--
-
 Debian-Art.org Stuff for Debian 
 Gentoo-Art.org Artwork for Gentoo Linux 
 SUSE-Art.org Artwork for openSUSE 
 Ubuntu-Art.org Artwork for Ubuntu 
 Kubuntu-Art.org Artwork for Kubuntu 
 LinuxMint-Art.org Artwork for Linux Mint 
 Arch-Stuff.org Art And Stuff for Arch Linux 
 Frugalware-Art.org Themes for Frugalware 
 Fedora-Art.org Artwork for Fedora Linux 
 Mandriva-Art.org Artwork for Mandriva Linux 
--
-
 KDE-Files.org Files for KDE Applications 
 OpenTemplate.org Documents for OpenOffice.org
 GIMPStuff.org Files for GIMP
 InkscapeStuff.org Files for Inkscape
 ScribusStuff.org Files for Scribus
 BlenderStuff.org Textures and Objects for Blender
 VLC-Addons.org Themes and Extensions for VLC
--
-
 KDE-Help.org Support for your KDE Desktop 
 GNOME-Help.org Support for your GNOME Desktop 
 Xfce-Help.org Support for your Xfce Desktop 
--
openDesktop.orgopenDesktop.org:   Applications   Artwork   Linux Distributions   Documents    LinuxDaily.com    Linux42.org    OpenSkillz.com   
 
Apps
News
Groups
Knowledge
Events
Forum
People
Jobs
Register
Login


Sponsoring


-
- Content .- Fans (1) . 

KDiff3

   0.9.96  

KDE Development Tool

Score 84%
KDiff3
zoom


Link:  Link
Minimum required   KDE 4.x
Downloads:  6394
Submitted:  Jan 3 2004
Updated:  Sep 3 2011

Description:

Tool for Comparison and Merge of Files and Directories.

Shows the differences line by line and character by character (!).

Provides an automatic merge-facility and
an integrated editor for comfortable solving of merge-conflicts.

Supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.).

Konqueror context menu plugin included.

Unicode & UTF-8 support

Translations by the KDE-I18N-Team:
Interface: az, bg, br, ca, cs, cy, da, de, el, en, en_GB, es, et, fr, ga, gl, hi, hu, is, it, ja, ka, lt, nb, nl, pl, pt, pt_BR, ro, ru, rw, sr, sr@Latn, sv, ta, tg, tr, uk, zh_CN

Documentation: da, de, es, et, fr, it, nl, pt, sv




Changelog:

KDiff3 0.9.96:
KDiff3FileItemActionPlugin: Context menu plugin for Dolphin.
And several other improvements.
(for details see the homepage)




LicenseGPL
Send to a friend
Subscribe
Other  Apps  from joachimeibl
Report inappropriate content



goto page:  1  2 

-

 Pretty cool

 
 by oshogg on: Jan 5 2004
 
Score 50%

Kdiff3 is my favorite front end for diff!! Keep up the good work!


Reply to this

-

 wrong section?

 
 by panzi on: Jan 7 2004
 
Score 50%

KDiff3 is cool, but is this the right place for it? Shouldn't it be posted under development tools?


Reply to this

-

 Re: wrong section?

 
 by joachimeibl on: Jan 7 2004
 
Score 50%

I hope it's acceptable now.


Reply to this

-
.

 A new feature idea

 
 by jasoderh on: Jan 11 2004
 
Score 50%

One very useful feature would be that if one could open a patch file and then compare it to an source file or directory, then KDiff could show the original source file so that changes would show in the different color.

I would be then very easy to check the changes that the patch will cause.

T Jari


Reply to this

-

 Re: A new feature idea

 
 by joachimeibl on: Jan 11 2004
 
Score 50%

Currently you can view *.patch-files for single files in Konquerer via context-menu "Preview with KDiff3Part". But patch-files must be in unified format and one of the two files mentioned in the patch-file must be available. I consider to allow this for directory-patch-files too, but that will be much more effort.

Is this what you meant?

Joachim


Reply to this

-

 Re: Re: A new feature idea

 
 by jasoderh on: Jan 11 2004
 
Score 50%

I was thinking that one could take a patch-file produced by diff-tool (as B-directory in KDiff) and then compare original sources-directory(as A-base directory) to that direcory (produced by diff-file(in B)), so that diff-file would look as an another source directory, which then could be merged by KDiff if one chooses to do so.

But I have no idea if it is possible to do that easily :-).

T Jari


Reply to this

-

 Re: Re: Re: A new feature idea

 
 by joachimeibl on: Jan 11 2004
 
Score 50%

Now I understand. I will investigate to see what I can do. But it will take some time.
Joachim


Reply to this

-
.

 Re: A new feature id

 
 by tjohnson3 on: Mar 23 2004
 
Score 50%

One of the biggest features I've been searching for in a diff-like application I've not found in any linux environment. Araxis (a windows merge program) has a feature that not only allows you to compare 3 different files much like this app, but you can merge from any of the three files inline. Meaning, you can see 7 different changes in file A to B, and you can click on change 1 and merge it from A to B...leaving the other 6 changes still there.


This type of feature is extremely useful in redundant systems where the config file may have OS/Server info that changes just slightly between versions (ip address maybe). With this feature, you could merge just the truely relevant differences, leaving necessary differences intact.


Also, I'd love to be able to edit a file in the gui. Mainly for the reason above. I have two config files and want to merge everything over...but change 1 line of code that needs to be different. Then save each file respectively.


Love the app though, this is my new favorite for my linux workstation. It does 90% of what I need to do (3 files, line numbers, color coding, network shares). Keep up the good work!


Reply to this

-

 Re: Re: A new feature id

 
 by joachimeibl on: Mar 25 2004
 
Score 50%

Although not as intuitive as editing the text directly in the diff-window you can achieve a similar result by either first selecting "Merge->Choose [A|B|C] Everywhere" and then changing the one thing you want to change, or doing your changes first and then selecting "Merge->Choose [A|B|C] For All Unsolved Conflicts".

Joachim


Reply to this

-

 kword/openoffice

 
 by gwyn on: Jan 24 2004
 
Score 50%

it would be useful (to me) if the text of kword/openoffice could also be compared using a plugin.
Currently, the version control system of openoffice (and msword) leave a lot to be desired. The paneled diff system used here is much more useful.


Reply to this

-

 Re: kword/openoffice

 
 by joachimeibl on: Jan 25 2004
 
Score 50%

I agree, it would be nice to compare other filetypes, but currently it's not my focus and I think it's a huge thing to implement. Support for other file-types might eventually extend to binary files (hex-view), text-documents (doc/html/xls/ppt/pdf), graphics (gif/jpg/svg), audio, video and so on. The first problem is to find ways to highlight differences specific for the filetype. The second problem is to integrate everything in one program (plugin-system?). Another aspect would be merging and hence writing all these formats to disk. Enough possibilities for many developers.

Joachim


Reply to this

-

 Changes for old gcc

 
 by schnassel on: May 30 2004
 
Score 50%

Change in ./src/pdiff.cpp:
line 465 to:
caption = ( f1.isEmpty()? QString("") : QString(".../")+f1 );
line 466 to:
caption += QString(caption.isEmpty() || f2.isEmpty() ? QString("") : QString( " ")) + ( f2.isEmpty()? QString("") : QString(".../")+f2 );
line 467 to:
caption += QString(caption.isEmpty() || f3.isEmpty() ? QString("") : QString(" ")) + ( f3.isEmpty()? QString(""): QString(".../")+f3 ) ;
line 470 to:
m_pKDiff3Shell->setCaption( caption.isEmpty() ? QString("KDiff3") : caption+QString(" - KDiff3"));


Reply to this

-

 Re: Changes for old gcc

 
 by joachimeibl on: Jun 14 2004
 
Score 50%

Thanks for the patch. Should be fixed in KDiff3-0.9.86.
Joachim


Reply to this

-

 Apply patch tool?

 
 by karye on: Oct 12 2005
 
Score 50%

Can KDiff3 apply patches?


Reply to this

-

 Re: Apply patch tool

 
 by joachimeibl on: Nov 20 2005
 
Score 50%

No, applying patches is not possible in the current version.


Reply to this

goto page:  1  2 

Add commentBack






-
-
Do you like or dislike Ubuntu Unity?
 Yes, unity is alien technology!
 It is less confusing than Gnome 3 default, shell.
 Granny thinks it is much more usable than Gnome 2
 Canonical is embarrasing itself with this split project
 Gnome 3 default shell is much better
 I dislike Unity, Gnome 3 default shell is alien technology!
 None of the above, I like the 2Gb for free and Apple alike behavior. Will post a comment instead

resultmore
 
 
 Who we are
Contact
More about us
Frequently Asked Questions
Register
Twitter
Blog
Explore
Apps
Jobs
Knowledge
Events
People
Updates on identi.ca
Updates on Twitter
Facebook App
Content RSS   
Events RSS   

Participate
Groups
Forum
Add App
Public API
About KDE-Apps.org
Legal Notice
Spreadshirt Shop
CafePress Shop
Advertising
Sponsor us
Report Abuse
 

Copyright 2003-2014 KDE-Apps.org Team  
All rights reserved. KDE-Apps.org is not liable for any content or goods on this site.
All contributors are responsible for the lawfulness of their uploads.
KDE and K Desktop Environment are trademarks of KDE e.V.