Mercurial > hg > easyhg-kdiff3

diff kdiff3/src-QT4/mergeresultwindow.cpp @ 103:1b9430d5cf2b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Separate deltas if only one is of type where B==C
author joachim99
date Sun, 28 Nov 2010 16:44:56 +0000
parents 236f1c9c3fbf
children 7bca1f1340f6
line wrap: on
line diff
--- a/kdiff3/src-QT4/mergeresultwindow.cpp	Thu Sep 02 20:27:45 2010 +0000
+++ b/kdiff3/src-QT4/mergeresultwindow.cpp	Sun Nov 28 16:44:56 2010 +0000
@@ -286,7 +286,9 @@
    }
    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
          );
 }