From 3277cf314c7face8bac42d2cf1f7558d18df9419 Mon Sep 17 00:00:00 2001 From: Patrick Ferris Date: Fri, 9 Dec 2022 14:08:58 +0000 Subject: [PATCH] Clarify merge_into documentation --- src/irmin/store_intf.ml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/irmin/store_intf.ml b/src/irmin/store_intf.ml index 7d033364a4..7593989914 100644 --- a/src/irmin/store_intf.ml +++ b/src/irmin/store_intf.ml @@ -941,9 +941,9 @@ module type S_generic_key = sig (** The type for merge functions. *) val merge_into : into:t -> t merge - (** [merge_into ~into i t] merges [t]'s current branch into [x]'s current - branch using the info [i]. After that operation, the two stores are still - independent. Similar to [git merge ]. *) + (** [merge_into ~into:x ~info:i t] merges [t]'s current branch into [x]'s + current branch using the info [i]. After that operation, the two stores + are still independent. Similar to [git merge ]. *) val merge_with_branch : t -> branch merge (** Same as {!val-merge} but with a branch ID. *)