diff options
Diffstat (limited to 'lib/management/merge.ml')
| -rw-r--r-- | lib/management/merge.ml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/management/merge.ml b/lib/management/merge.ml index d30545a..a8860fe 100644 --- a/lib/management/merge.ml +++ b/lib/management/merge.ml @@ -10,6 +10,7 @@ type conflict = type strategy = PreferLeft | PreferRight | RevertToAncestor type merge_result = Clean of Database.t | Failed of conflict list +(* TODO: Remove this later. We already should have the interface on the manipulation *) (** Module type for the subset of Manipulation.Make we need. *) module type MANIPULATION = sig type storage |