\section{Notation}
+xxx make all conditions be in conditions, not in (or also in) intro
+
\begin{basedescript}{
\desclabelwidth{5em}
\desclabelstyle{\nextlinelabel}
L \haspatch \pry
}\]
-\subsection{No Replay}
+\subsection{Ordering of ${L, R^+, R^-}$:}
By Unique Tip, $R^+ \le L$. By definition of $\base$, $R^- \le R^+$
-so $R^- \le L$. So $R^+ \le C$ and $R^- \le C$ and No Replay for
-Merge Results applies. $\qed$
+so $R^- \le L$. So $R^+ \le C$ and $R^- \le C$.
+
+(Note that the merge base $R^+ \not\le R^-$, i.e. the merge base is
+later than one of the branches to be merged.)
+
+\subsection{No Replay}
+
+No Replay for Merge Results applies. $\qed$
\subsection{Desired Contents}
Whereas if $L \haspatch \p$, $D \isin L \equiv D \le L$.
so $L \haspatch \p \implies C \haspatch \p$.
+\section{Foreign Inclusion}
+
+Consider some $D$ s.t. $\patchof{D} = \bot$. $D \neq C$.
+So by Desired Contents $D \isin C \equiv D \isin L$.
+By Foreign Inclusion of $D$ in $L$, $D \isin L \equiv D \le L$.
+So $D \isin C \equiv D \le L$.
+
+xxx up to here
+
+By Tip Contents of $R^+$, $D \isin R^+ \equiv D \isin \baseof{R^+}$
+i.e. $\equiv D \isin R^-$.
+So by $\merge$, $D \isin C \equiv D \isin L$.
+
+Thus $D \isin C \equiv $
+
\section{Merge}
Merge commits $L$ and $R$ using merge base $M$ ($M < L, M < R$):
\subsection{No Replay}
-See No Replay for Merge Results.
+No Replay for Merge Results applies. $\qed$
\subsection{Unique Base}
\subsubsection{For (wlog) $X \not\haspatch \p, Y \haspatch \p$:}
-$C \haspatch \p \equiv M \nothaspatch \p$.
+$M \haspatch \p \implies C \nothaspatch \p$.
+$M \nothaspatch \p \implies C \haspatch \p$.
\proofstarts