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:
abaf9e5
)
fix title etc. in merge use of no replay
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 5 Mar 2012 19:51:39 +0000
(19:51 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 5 Mar 2012 19:51:39 +0000
(19:51 +0000)
article.tex
patch
|
blob
|
history
diff --git
a/article.tex
b/article.tex
index be6d4759945ccdbfacbe46ab9527357abb874df4..89d23fe179d9bfc53524f3cfe65fb20d4425f51e 100644
(file)
--- a/
article.tex
+++ b/
article.tex
@@
-449,9
+449,9
@@
Merge commits $L$ and $R$ using merge base $M$ ($M < L, M < R$):
\end{cases}
}\]
-\subsection{
Merge Results
}
+\subsection{
No Replay
}
-
As above
.
+
See No Replay for Merge Results
.
\subsection{Unique Base}