X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=notation.tex;h=82a2e647dbac266a769374a422727af8c92e6663;hb=6421387b9888acd36b8fddc9b8bb6688f171acb4;hp=f8f2b87973b9ad3740b7c4f4a595ac10e293c830;hpb=547f81711b274591ce075b8df2c3e41c6394eb93;p=topbloke-formulae.git diff --git a/notation.tex b/notation.tex index f8f2b87..82a2e64 100644 --- a/notation.tex +++ b/notation.tex @@ -112,7 +112,7 @@ $$ $$ \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} @@ -121,4 +121,6 @@ $\displaystyle D \isin C \equiv \end{cases} $ +We will refer to this as \commitmergename. + \end{basedescript}