X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=blobdiff_plain;f=merge.tex;fp=merge.tex;h=63817cad1f42cde111426bc749f892b1c020365b;hp=746ba2d6f6dead05b0e72c95cc1fef058365a505;hb=7edfc980fd47d8df763c91322fcc3dc8ed5b9ff7;hpb=13bb63711973608b167a8624d32e5323b866bbe6 diff --git a/merge.tex b/merge.tex index 746ba2d..63817ca 100644 --- a/merge.tex +++ b/merge.tex @@ -146,7 +146,7 @@ $$ $D \not\isin L \land D \not\isin R$. $C \not\in \py$ (otherwise $L \in \py$ ie $L \haspatch \p$ by Tip Own Contents for $L$). So $D \neq C$. -Applying \commitmergename gives $D \not\isin C$ i.e. $C \nothaspatch \p$. +Applying \commitmergename\ gives $D \not\isin C$ i.e. $C \nothaspatch \p$. OK. \subsubsection{For $L \haspatch \p, R \haspatch \p$:}