KDiff3 is a program that:

    * compares or merges two or three text input files or 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.),
    * and has an intuitive graphical user interface.

WWW: http://kdiff3.sourceforge.net/

Heiner
h.eichmann@gmx.de
3612d8092bfa'/>
<id>a8613014074dbb57e6086657f6503612d8092bfa</id>
<content type='text'>
Obtained from:	Xorg devel repo
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Obtained from:	Xorg devel repo
</pre>
</div>
</content>
</entry>
<entry>
<title>- Add LICENSE_FILE</title>
<updated>2015-05-08T05:23:12+00:00</updated>
<author>
<name>amdmi3</name>
<email>amdmi3@FreeBSD.org</email>
</author>
<published>2015-05-08T05:23:12+00:00</published>
<link rel='alternate' type='text/html' href='http://tfcis.org/~lantw44/cgit/cgit.cgi/freebsd-ports-gnome/commit/?id=44303d415881673cb351e747ba172a7568ea3919'/>
<id>44303d415881673cb351e747ba172a7568ea3919</id>
<content type='text'>
- Add CPE info

Approved by:	portmgr blanket
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
- Add CPE info

Approved by:	portmgr blanket
</pre>
</div>
</content>
</entry>