\item[ $\displaystyle \stmtmergeof{L}{M}{R} $ ]
The proper results of a merge. Formally,
where $L$, $M$ and $R$ are statements:
-
$$
\stmtmergeof{L}{M}{R}
\equiv
$$
\item[ $\displaystyle \commitmergeof{C}{L}{M}{R} $ ]
-The contents of a git merge result:
+$C$ has exactly the contents of a git merge result:
$\displaystyle D \isin C \equiv
\begin{cases}
- (D \isin L \land D \isin R) \lor D = C : & \true \\
- (D \not\isin L \land D \not\isin R) \land D \neq C : & \false \\
- \text{otherwise} : & D \not\isin M
+ D = C : & \true \\
+ D \neq C : & \stmtmergeof{ D \isin L }{ D \isin M }{ D \isin R }
\end{cases}
$
+We will refer to this as \commitmergename.
+
\end{basedescript}