Mercurial > hg > easyhg-kdiff3

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
KDiff3 0.9.95
author joachim99
date Tue, 03 Mar 2009 23:50:12 +0000
parents fcd146072e0c
children
line wrap: on
line diff
--- a/kdiff3/src-QT4/directorymergewindow.h	Tue Jan 06 22:31:57 2009 +0000
+++ b/kdiff3/src-QT4/directorymergewindow.h	Tue Mar 03 23:50:12 2009 +0000
@@ -48,6 +48,7 @@
    eCopyAToDest, eCopyBToDest, eCopyCToDest, eDeleteFromDest, eMergeABCToDest,
    eMergeABToDest,
    eConflictingFileTypes, // Error
+   eChangedAndDeleted,    // Error
    eConflictingAges       // Equal age but files are not!
 };