Sophie

Sophie

distrib > Fedora > 13 > i386 > media > updates > by-pkgid > b0c98c29aff20adb5ac5f9eed34fc595 > files > 113

ghc-darcs-doc-2.4.4-1.fc13.i686.rpm

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!--Rendered using the Haskell Html Library v0.2-->
<HTML
><HEAD
><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8"
><TITLE
>Darcs.Resolution</TITLE
><LINK HREF="haddock.css" REL="stylesheet" TYPE="text/css"
><SCRIPT SRC="haddock-util.js" TYPE="text/javascript"
></SCRIPT
><SCRIPT TYPE="text/javascript"
>window.onload = function () {setSynopsis("mini_Darcs-Resolution.html")};</SCRIPT
></HEAD
><BODY
><TABLE CLASS="vanilla" CELLSPACING="0" CELLPADDING="0"
><TR
><TD CLASS="topbar"
><TABLE CLASS="vanilla" CELLSPACING="0" CELLPADDING="0"
><TR
><TD
><IMG SRC="haskell_icon.gif" WIDTH="16" HEIGHT="16" ALT=" "
></TD
><TD CLASS="title"
>darcs-2.4.4: a distributed, interactive, smart revision control system</TD
><TD CLASS="topbut"
><A HREF="index.html"
>Contents</A
></TD
><TD CLASS="topbut"
><A HREF="doc-index.html"
>Index</A
></TD
></TR
></TABLE
></TD
></TR
><TR
><TD CLASS="modulebar"
><TABLE CLASS="vanilla" CELLSPACING="0" CELLPADDING="0"
><TR
><TD
><FONT SIZE="6"
>Darcs.Resolution</FONT
></TD
></TR
></TABLE
></TD
></TR
><TR
><TD CLASS="s15"
></TD
></TR
><TR
><TD CLASS="s15"
></TD
></TR
><TR
><TD CLASS="s15"
></TD
></TR
><TR
><TD CLASS="section1"
>Documentation</TD
></TR
><TR
><TD CLASS="s15"
></TD
></TR
><TR
><TD CLASS="decl"
><A NAME="v:standard_resolution"
><A NAME="v%3Astandard_resolution"
></A
></A
><B
>standard_resolution</B
> :: <A HREF="Darcs-Patch.html#t%3ARepoPatch"
>RepoPatch</A
> p =&gt; p -&gt; <A HREF="Darcs-Witnesses-Sealed.html#t%3ASealed"
>Sealed</A
> (<A HREF="Darcs-Witnesses-Ordered.html#t%3AFL"
>FL</A
> <A HREF="Darcs-Patch-Prim.html#t%3APrim"
>Prim</A
>)</TD
></TR
><TR
><TD CLASS="s15"
></TD
></TR
><TR
><TD CLASS="decl"
><A NAME="v:external_resolution"
><A NAME="v%3Aexternal_resolution"
></A
></A
><B
>external_resolution</B
> :: <A HREF="Darcs-Patch.html#t%3ARepoPatch"
>RepoPatch</A
> p =&gt; <A HREF="/usr/share/doc/ghc/html/libraries/hashed-storage-0.4.13/Storage-Hashed-Tree.html#t%3ATree"
>Tree</A
> <A HREF="/usr/share/doc/ghc/html/libraries/base-4.2.0.0/System-IO.html#t%3AIO"
>IO</A
> -&gt; <A HREF="/usr/share/doc/ghc/html/libraries/base-4.2.0.0/Data-Char.html#t%3AString"
>String</A
> -&gt; <A HREF="Darcs-Witnesses-Ordered.html#t%3AFL"
>FL</A
> <A HREF="Darcs-Patch-Prim.html#t%3APrim"
>Prim</A
> -&gt; <A HREF="Darcs-Witnesses-Ordered.html#t%3AFL"
>FL</A
> <A HREF="Darcs-Patch-Prim.html#t%3APrim"
>Prim</A
> -&gt; p -&gt; <A HREF="/usr/share/doc/ghc/html/libraries/base-4.2.0.0/System-IO.html#t%3AIO"
>IO</A
> (<A HREF="Darcs-Witnesses-Sealed.html#t%3ASealed"
>Sealed</A
> (<A HREF="Darcs-Witnesses-Ordered.html#t%3AFL"
>FL</A
> <A HREF="Darcs-Patch-Prim.html#t%3APrim"
>Prim</A
>))</TD
></TR
><TR
><TD CLASS="s15"
></TD
></TR
><TR
><TD CLASS="decl"
><A NAME="v:patchset_conflict_resolutions"
><A NAME="v%3Apatchset_conflict_resolutions"
></A
></A
><B
>patchset_conflict_resolutions</B
> :: <A HREF="Darcs-Patch.html#t%3ARepoPatch"
>RepoPatch</A
> p =&gt; <A HREF="Darcs-Patch-Set.html#t%3APatchSet"
>PatchSet</A
> p -&gt; <A HREF="Darcs-Witnesses-Sealed.html#t%3ASealed"
>Sealed</A
> (<A HREF="Darcs-Witnesses-Ordered.html#t%3AFL"
>FL</A
> <A HREF="Darcs-Patch-Prim.html#t%3APrim"
>Prim</A
>)</TD
></TR
><TR
><TD CLASS="s15"
></TD
></TR
><TR
><TD CLASS="botbar"
>Produced by <A HREF="http://www.haskell.org/haddock/"
>Haddock</A
> version 2.6.0</TD
></TR
></TABLE
></BODY
></HTML
>