Commits

Anonymous committed f161515

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

Comments (0)

Files changed (4)

    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, 

src-QT4/mergeresultwindow.cpp

    }
    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
          );
 }

src-QT4/pdiff.cpp

    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
 

src-QT4/version.h

 #undef VERSION
-#define VERSION "0.9.96a"
+#define VERSION "0.9.96d"