summaryrefslogtreecommitdiff
path: root/structures.h
diff options
context:
space:
mode:
Diffstat (limited to 'structures.h')
-rw-r--r--structures.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/structures.h b/structures.h
index ba9c3ada..212f9557 100644
--- a/structures.h
+++ b/structures.h
@@ -277,7 +277,8 @@ enum SyncOperation
SO_DELETE_RIGHT,
SO_OVERWRITE_LEFT,
SO_OVERWRITE_RIGHT,
- SO_DO_NOTHING,
+ SO_DO_NOTHING, //= both sides differ, but nothing will be synced
+ SO_EQUAL, //= both sides are equal, so nothing will be synced
SO_UNRESOLVED_CONFLICT
};
bgstack15