comparison kdiff3/src-QT4/directorymergewindow.h @ 92:4e6ebbbae925 0.9.95

KDiff3 0.9.95

 
    // Operations in merge mode (with two or three directories)
    eCopyAToDest, eCopyBToDest, eCopyCToDest, eDeleteFromDest, eMergeABCToDest,
    eMergeABToDest,
    eConflictingFileTypes, // Error
+   eChangedAndDeleted,    // Error
    eConflictingAges       // Equal age but files are not!
 };
 
 class DirMergeItem;