Mercurial > hg > easyhg-kdiff3


-- About "KDiff3 for EasyHg"

This is a version of KDiff3 (http://kdiff3.sourceforge.net/) with some
modifications to make it appear simpler when used as a diff viewer
with EasyMercurial (http://code.soundsoftware.ac.uk/projects/easyhg).

-- To build

For EasyMercurial packages we always build KDiff3 in "pure Qt4 mode"
rather than as a KDE application.  It is in the Qt4-based source that
our changes appear, and they are in the Mercurial branch
"easyhg_kdiff3_simplifications".

Thus:

 * if starting from repository: hg update easyhg_kdiff3_simplifications

 * cd kdiff3/src-QT4

 * qmake

 * make

Our changes are all guarded by #ifdef SIMPLIFIED_KDIFF3, which is
defined by default in kdiff3/src-QT4/kdiff3.pro in this tree.

-- What's changed?

 * The progress dialog and change summary dialog are no longer
   displayed on startup -- just the main window

 * If only two files or directories are provided (i.e. the program is
   being called for a diff rather than a merge), the Merge menu and
   merge functions elsewhere are no longer displayed

 * The change tree in the directory diff view is now expanded by
   default

-- Chris Cannam, May 2011
author	Chris Cannam
date	Thu, 26 May 2011 11:03:06 +0100
parents	b2f15a7c66cc
children