Skip to content

Commit

Permalink
Merge pull request #2153 from patricoferris/merge-into-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
metanivek authored Dec 9, 2022
2 parents 2f37f24 + 3277cf3 commit 5a3ac3f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/irmin/store_intf.ml
Original file line number Diff line number Diff line change
Expand Up @@ -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 <branch>]. *)
(** [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 <branch>]. *)

val merge_with_branch : t -> branch merge
(** Same as {!val-merge} but with a branch ID. *)
Expand Down

0 comments on commit 5a3ac3f

Please sign in to comment.