Mercurial > hg > easyhg-kdiff3

changeset 44:bf8fa177e5a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix for MergeOperation DeleteAB.
author joachim99
date Wed, 15 Oct 2003 20:14:03 +0000
parents bd0d29eb0d7b
children 42106f54567f
files kdiff3/src/directorymergewindow.cpp
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/kdiff3/src/directorymergewindow.cpp	Wed Oct 15 19:54:41 2003 +0000
+++ b/kdiff3/src/directorymergewindow.cpp	Wed Oct 15 20:14:03 2003 +0000
@@ -17,6 +17,9 @@
 
 /***************************************************************************
  * $Log$
+ * Revision 1.3  2003/10/15 20:14:03  joachim99
+ * Fix for MergeOperation DeleteAB.
+ *
  * Revision 1.2  2003/10/11 12:41:57  joachim99
  * Fix for gcc 2.95
  *
@@ -1594,6 +1597,7 @@
       switch( mfi.m_eMergeOperation )
       {
       case eNoOperation: break;
+      case eDeleteAB:    break;
       case eMergeToAB:   // let the user save in B. In mergeResultSaved() the file will be copied to A.
       case eMergeToB:
       case eDeleteB: