<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Darcs.Repository.Merge</title><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean" /><script src="haddock-util.js" type="text/javascript"></script><script type="text/javascript">//<![CDATA[
window.onload = function () {pageLoad();setSynopsis("mini_Darcs-Repository-Merge.html");};
//]]>
</script></head><body><div id="package-header"><ul class="links" id="page-menu"><li><a href="src/Darcs-Repository-Merge.html">Source</a></li><li><a href="index.html">Contents</a></li><li><a href="doc-index.html">Index</a></li></ul><p class="caption">darcs-2.8.3: a distributed, interactive, smart revision control system</p></div><div id="content"><div id="module-header"><table class="info"><tr><th>Safe Haskell</th><td>Safe-Infered</td></tr></table><p class="caption">Darcs.Repository.Merge</p></div><div id="interface"><h1>Documentation</h1><div class="top"><p class="src"><a name="v:tentativelyMergePatches" class="def">tentativelyMergePatches</a> :: (<a href="Darcs-Patch-RepoPatch.html#t:RepoPatch">RepoPatch</a> p, <a href="Darcs-Patch-Apply.html#t:ApplyState">ApplyState</a> p ~ <a href="/usr/share/doc/ghc/html/libraries/hashed-storage-0.5.9/Storage-Hashed-Tree.html#t:Tree">Tree</a>) => <a href="Darcs-Repository-InternalTypes.html#t:Repository">Repository</a> p r u t -> <a href="/usr/share/doc/ghc/html/libraries/base-4.5.0.0/Data-String.html#t:String">String</a> -> [<a href="Darcs-Flags.html#t:DarcsFlag">DarcsFlag</a>] -> <a href="Darcs-Witnesses-Ordered.html#t:FL">FL</a> (<a href="Darcs-Patch-PatchInfoAnd.html#t:PatchInfoAnd">PatchInfoAnd</a> p) x t -> <a href="Darcs-Witnesses-Ordered.html#t:FL">FL</a> (<a href="Darcs-Patch-PatchInfoAnd.html#t:PatchInfoAnd">PatchInfoAnd</a> p) x y -> <a href="/usr/share/doc/ghc/html/libraries/base-4.5.0.0/System-IO.html#t:IO">IO</a> (<a href="Darcs-Witnesses-Sealed.html#t:Sealed">Sealed</a> (<a href="Darcs-Witnesses-Ordered.html#t:FL">FL</a> (<a href="Darcs-Patch-Prim-Class.html#t:PrimOf">PrimOf</a> p) u))<a href="src/Darcs-Repository-Merge.html#tentativelyMergePatches" class="link">Source</a></p></div><div class="top"><p class="src"><a name="v:considerMergeToWorking" class="def">considerMergeToWorking</a> :: (<a href="Darcs-Patch-RepoPatch.html#t:RepoPatch">RepoPatch</a> p, <a href="Darcs-Patch-Apply.html#t:ApplyState">ApplyState</a> p ~ <a href="/usr/share/doc/ghc/html/libraries/hashed-storage-0.5.9/Storage-Hashed-Tree.html#t:Tree">Tree</a>) => <a href="Darcs-Repository-InternalTypes.html#t:Repository">Repository</a> p r u t -> <a href="/usr/share/doc/ghc/html/libraries/base-4.5.0.0/Data-String.html#t:String">String</a> -> [<a href="Darcs-Flags.html#t:DarcsFlag">DarcsFlag</a>] -> <a href="Darcs-Witnesses-Ordered.html#t:FL">FL</a> (<a href="Darcs-Patch-PatchInfoAnd.html#t:PatchInfoAnd">PatchInfoAnd</a> p) x t -> <a href="Darcs-Witnesses-Ordered.html#t:FL">FL</a> (<a href="Darcs-Patch-PatchInfoAnd.html#t:PatchInfoAnd">PatchInfoAnd</a> p) x y -> <a href="/usr/share/doc/ghc/html/libraries/base-4.5.0.0/System-IO.html#t:IO">IO</a> (<a href="Darcs-Witnesses-Sealed.html#t:Sealed">Sealed</a> (<a href="Darcs-Witnesses-Ordered.html#t:FL">FL</a> (<a href="Darcs-Patch-Prim-Class.html#t:PrimOf">PrimOf</a> p) u))<a href="src/Darcs-Repository-Merge.html#considerMergeToWorking" class="link">Source</a></p></div></div></div><div id="footer"><p>Produced by <a href="http://www.haskell.org/haddock/">Haddock</a> version 2.10.0</p></div></body></html>
