Sophie

Sophie

distrib > Fedora > 18 > i386 > by-pkgid > db7a4a658d190b3e658423135710c498 > files > 645

ghc-darcs-devel-2.8.3-1.fc18.i686.rpm

<!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.Patch.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-Patch-Merge.html");};
//]]>
</script></head><body><div id="package-header"><ul class="links" id="page-menu"><li><a href="src/Darcs-Patch-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>Portability</th><td>portable</td></tr><tr><th>Stability</th><td>experimental</td></tr><tr><th>Maintainer</th><td>darcs-devel@darcs.net</td></tr><tr><th>Safe Haskell</th><td>Safe-Infered</td></tr></table><p class="caption">Darcs.Patch.Merge</p></div><div id="description"><p class="caption">Description</p><div class="doc empty">&nbsp;</div></div><div id="synopsis"><p id="control.syn" class="caption expander" onclick="toggleSection('syn')">Synopsis</p><ul id="section.syn" class="hide" onclick="toggleSection('syn')"><li class="src short"><span class="keyword">class</span> <a href="Darcs-Patch-Commute.html#t:Commute">Commute</a> p =&gt; <a href="#t:Merge">Merge</a> p  <span class="keyword">where</span><ul class="subs"><li><a href="#v:merge">merge</a> ::  (p <a href="Darcs-Witnesses-Ordered.html#t::-92--47-:">:\/:</a> p) x y -&gt; (p <a href="Darcs-Witnesses-Ordered.html#t::-47--92-:">:/\:</a> p) x y</li></ul></li><li class="src short"><a href="#v:mergeFL">mergeFL</a> :: <a href="Darcs-Patch-Merge.html#t:Merge">Merge</a> p =&gt; (p <a href="Darcs-Witnesses-Ordered.html#t::-92--47-:">:\/:</a> <a href="Darcs-Witnesses-Ordered.html#t:FL">FL</a> p) x y -&gt; (<a href="Darcs-Witnesses-Ordered.html#t:FL">FL</a> p <a href="Darcs-Witnesses-Ordered.html#t::-47--92-:">:/\:</a> p) x y</li></ul></div><div id="interface"><h1>Documentation</h1><div class="top"><p class="src"><span class="keyword">class</span> <a href="Darcs-Patch-Commute.html#t:Commute">Commute</a> p =&gt; <a name="t:Merge" class="def">Merge</a> p  <span class="keyword">where</span><a href="src/Darcs-Patch-Merge.html#Merge" class="link">Source</a></p><div class="doc"><p>Things that can always be merged
</p></div><div class="subs methods"><p class="caption">Methods</p><p class="src"><a name="v:merge" class="def">merge</a> ::  (p <a href="Darcs-Witnesses-Ordered.html#t::-92--47-:">:\/:</a> p) x y -&gt; (p <a href="Darcs-Witnesses-Ordered.html#t::-47--92-:">:/\:</a> p) x y<a href="src/Darcs-Patch-Merge.html#merge" class="link">Source</a></p></div><div class="subs instances"><p id="control.i:Merge" class="caption collapser" onclick="toggleSection('i:Merge')">Instances</p><div id="section.i:Merge" class="show"><table><tr><td class="src"><a href="Darcs-Patch-Merge.html#t:Merge">Merge</a> p =&gt; <a href="Darcs-Patch-Merge.html#t:Merge">Merge</a> (<a href="Darcs-Witnesses-Ordered.html#t:RL">RL</a> p)</td><td class="doc empty">&nbsp;</td></tr><tr><td class="src"><a href="Darcs-Patch-Merge.html#t:Merge">Merge</a> p =&gt; <a href="Darcs-Patch-Merge.html#t:Merge">Merge</a> (<a href="Darcs-Witnesses-Ordered.html#t:FL">FL</a> p)</td><td class="doc empty">&nbsp;</td></tr><tr><td class="src"><a href="Darcs-Patch-Prim-Class.html#t:PrimPatch">PrimPatch</a> prim =&gt; <a href="Darcs-Patch-Merge.html#t:Merge">Merge</a> (<a href="Darcs-Patch-V1-Core.html#t:Patch">Patch</a> prim)</td><td class="doc empty">&nbsp;</td></tr><tr><td class="src"><a href="Darcs-Patch-Merge.html#t:Merge">Merge</a> p =&gt; <a href="Darcs-Patch-Merge.html#t:Merge">Merge</a> (<a href="Darcs-Patch-Named.html#t:Named">Named</a> p)</td><td class="doc empty">&nbsp;</td></tr><tr><td class="src"><a href="Darcs-Patch-Merge.html#t:Merge">Merge</a> p =&gt; <a href="Darcs-Patch-Merge.html#t:Merge">Merge</a> (<a href="Darcs-Patch-PatchInfoAnd.html#t:PatchInfoAnd">PatchInfoAnd</a> p)</td><td class="doc empty">&nbsp;</td></tr><tr><td class="src"><a href="Darcs-Patch-Merge.html#t:Merge">Merge</a> p =&gt; <a href="Darcs-Patch-Merge.html#t:Merge">Merge</a> (PatchChoice p)</td><td class="doc empty">&nbsp;</td></tr><tr><td class="src"><a href="Darcs-Patch-Merge.html#t:Merge">Merge</a> p =&gt; <a href="Darcs-Patch-Merge.html#t:Merge">Merge</a> (<a href="Darcs-Patch-Choices.html#t:TaggedPatch">TaggedPatch</a> p)</td><td class="doc empty">&nbsp;</td></tr><tr><td class="src"><a href="Darcs-Patch-Prim-Class.html#t:PrimPatch">PrimPatch</a> prim =&gt; <a href="Darcs-Patch-Merge.html#t:Merge">Merge</a> (<a href="Darcs-Patch-V2-Real.html#t:RealPatch">RealPatch</a> prim)</td><td class="doc empty">&nbsp;</td></tr></table></div></div></div><div class="top"><p class="src"><a name="v:mergeFL" class="def">mergeFL</a> :: <a href="Darcs-Patch-Merge.html#t:Merge">Merge</a> p =&gt; (p <a href="Darcs-Witnesses-Ordered.html#t::-92--47-:">:\/:</a> <a href="Darcs-Witnesses-Ordered.html#t:FL">FL</a> p) x y -&gt; (<a href="Darcs-Witnesses-Ordered.html#t:FL">FL</a> p <a href="Darcs-Witnesses-Ordered.html#t::-47--92-:">:/\:</a> p) x y<a href="src/Darcs-Patch-Merge.html#mergeFL" 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>