diff options
Diffstat (limited to 'src/diff.h')
-rw-r--r-- | src/diff.h | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -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; |