# HG changeset patch
# User joachim99
# Date 1066248843 0
# Node ID bf8fa177e5a107f63232641a32da3d9df2416f86
# Parent  bd0d29eb0d7b8dc6e61f18db20237976e8a7676f
Fix for MergeOperation DeleteAB.

diff -r bd0d29eb0d7b -r bf8fa177e5a1 kdiff3/src/directorymergewindow.cpp
--- 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: