many fixes

--cleanup implemented


git-svn-id: file:///home/lennart/svn/public/syrep/trunk@13 07ea20a6-d2c5-0310-9e02-9ef735347d72

1 files changed, 6 insertions, 1 deletions

diff --git a/src/diff.h b/src/diff.h
index a746092..2c1c134 100644
--- a/src/diff.h
+++ b/src/diff.h
@@ -24,7 +24,12 @@
 #include "context.h"
 #include "dbstruct.h"
 
-enum { DIFF_COPY, DIFF_DELETE, DIFF_CONFLICT, DIFF_IGNORE };
+/*
+ * Please note that DIFF_REPLACE is never set by make_diff(). Instead
+ * it is used for conflict resolution in merge.c
+ */
+
+enum { DIFF_COPY, DIFF_DELETE, DIFF_CONFLICT, DIFF_REPLACE };
 
 struct diff_entry {
     int action;