chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
13bb637
)
merge: Fix formatting
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 10 Aug 2013 19:11:16 +0000
(20:11 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 10 Aug 2013 19:11:16 +0000
(20:11 +0100)
merge.tex
patch
|
blob
|
history
diff --git
a/merge.tex
b/merge.tex
index 746ba2d6f6dead05b0e72c95cc1fef058365a505..63817cad1f42cde111426bc749f892b1c020365b 100644
(file)
--- 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$:}