diff options
| author | Marcos Magueta <maguetamarcos@gmail.com> | 2026-04-27 23:29:57 -0300 |
|---|---|---|
| committer | Marcos Magueta <maguetamarcos@gmail.com> | 2026-04-27 23:29:57 -0300 |
| commit | 4fdf3392868c72ff4c33b70d165a177e97f2fece (patch) | |
| tree | 4eebfc260c890ea56d59f874cdfa0c9b1f55cd98 /lib/management/merge.ml | |
| parent | 97960adb8426e5270fe16b027e82a2c61674f821 (diff) | |
| download | Sakura-4fdf3392868c72ff4c33b70d165a177e97f2fece.tar.gz Sakura-4fdf3392868c72ff4c33b70d165a177e97f2fece.zip | |
Format
Diffstat (limited to 'lib/management/merge.ml')
| -rw-r--r-- | lib/management/merge.ml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/management/merge.ml b/lib/management/merge.ml index a8860fe..dff4808 100644 --- a/lib/management/merge.ml +++ b/lib/management/merge.ml @@ -11,6 +11,7 @@ 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 @@ -279,9 +280,9 @@ struct all_conflicts in if unresolvable <> [] then Ok (Failed unresolvable) - else begin - match Manip.store_database storage merged_db with + else + begin match Manip.store_database storage merged_db with | Error e -> Error e | Ok () -> Ok (Clean merged_db) - end))) + end))) end |