From: Ian Jackson Date: Sat, 10 Aug 2013 19:11:16 +0000 (+0100) Subject: merge: Fix formatting X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=7edfc980fd47d8df763c91322fcc3dc8ed5b9ff7;hp=13bb63711973608b167a8624d32e5323b866bbe6;p=topbloke-formulae.git merge: Fix formatting --- 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$:}