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:
6595957
)
merge fixes/clarifications - relax Foreign Merges
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 16 Mar 2012 21:55:38 +0000
(21:55 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 16 Mar 2012 21:55:38 +0000
(21:55 +0000)
merge.tex
patch
|
blob
|
history
diff --git
a/merge.tex
b/merge.tex
index e9b5aa26c7272d039d3f14a33dfb098563c466dd..f153811f3e7864b0ebad85fb3db274f9adc96099 100644
(file)
--- a/
merge.tex
+++ b/
merge.tex
@@
-47,7
+47,7
@@
$L \in \pn$, $R \in \pry$, $M = \baseof{R}$.
\right]
}\]
\[ \eqn{ Foreign Merges }{
- \patchof{L} = \bot \
equiv
\patchof{R} = \bot
+ \patchof{L} = \bot \
implies
\patchof{R} = \bot
}\]
\subsection{Non-Topbloke merges}