Commit f8cbe7d6 authored by Joachim Eibl's avatar Joachim Eibl

Separate deltas if only one is of type where B==C

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@107 c8aa9fed-2811-0410-8543-893ada326672
parent 5ce2ab13
......@@ -162,7 +162,7 @@ int main(int argc, char *argv[])
const KLocalizedString i18nName = ki18n("kdiff3");
const QByteArray& appVersion = QByteArray( VERSION );
const KLocalizedString description = ki18n("Tool for Comparison and Merge of Files and Directories");
const KLocalizedString copyright = ki18n("(c) 2002-2009 Joachim Eibl");
const KLocalizedString copyright = ki18n("(c) 2002-2010 Joachim Eibl");
const QByteArray& homePage = "http://kdiff3.sourceforge.net/";
const QByteArray& bugsAddress = "joachim.eibl" "@" "gmx.de";
KAboutData aboutData( appName, appCatalog, i18nName,
......
......@@ -286,7 +286,9 @@ bool MergeResultWindow::sameKindCheck( const MergeLine& ml1, const MergeLine& ml
}
else
return (
!ml1.bConflict && !ml2.bConflict && ml1.bDelta && ml2.bDelta && ml1.srcSelect == ml2.srcSelect ||
!ml1.bConflict && !ml2.bConflict && ml1.bDelta && ml2.bDelta && ml1.srcSelect == ml2.srcSelect
&& (ml1.mergeDetails==ml2.mergeDetails || ml1.mergeDetails!=eBCAddedAndEqual && ml2.mergeDetails!=eBCAddedAndEqual )
||
!ml1.bDelta && !ml2.bDelta
);
}
......
......@@ -771,6 +771,10 @@ void KDiff3App::initView()
sizes[0]=total/2; sizes[1]=total/2;
pVSplitter->setSizes( sizes );
QList<int> hSizes;
hSizes << 1 << 1 << 1;
m_pDiffWindowSplitter->setSizes( hSizes );
m_pMergeResultWindow->installEventFilter( this ); // for Cut/Copy/Paste-shortcuts
m_pMergeResultWindow->installEventFilter( m_pMergeResultWindowTitle ); // for focus tracking
......
#undef VERSION
#define VERSION "0.9.96a"
#define VERSION "0.9.96d"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment