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
(parent:
e938c14
)
internal notation: rename \merge and \mergeof to \commitmerge and \commitmergeof...
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 7 Jul 2012 16:10:23 +0000
(17:10 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 7 Jul 2012 16:10:23 +0000
(17:10 +0100)
notation.tex
patch
|
blob
|
history
diff --git
a/notation.tex
b/notation.tex
index 48ea1b7e2ceec9002f67b2d41335e5c227b69f25..bb12b5ffc5e2faa17090b5b4e6dfe1a9745bb941 100644
(file)
--- a/
notation.tex
+++ b/
notation.tex
@@
-86,7
+86,7
@@
the relevant Topbloke branches, we hope that
if the user still cares about the Topbloke patch,
git's merge algorithm will DTRT when trying to re-apply the changes.
-\item[ $\displaystyle \mergeof{C}{L}{M}{R} $ ]
+\item[ $\displaystyle \
commit
mergeof{C}{L}{M}{R} $ ]
The contents of a git merge result:
$\displaystyle D \isin C \equiv