(merge2 a b fix)
(merge3 ancestor fork-a fork-b)
(merge3 ancestor fork-a fork-b fix)
3-way merge for maps. Onc conflict fix is called with five arguments: key, value in ancestor, value in fork-a, value in fork-b, not-found. When one of the value is not-found it means the entry is not present for the corresponding map.
3-way merge for maps. Onc conflict fix is called with five arguments: key, value in ancestor, value in fork-a, value in fork-b, not-found. When one of the value is not-found it means the entry is not present for the corresponding map.
cljdoc is a website building & hosting documentation for Clojure/Script libraries
× close