chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pseudomerge: commentary about foreign apparently-pseudo merges
[topbloke-formulae.git]
/
merge.tex
diff --git
a/merge.tex
b/merge.tex
index 5bb0db2b79feffdd0be6452064c36c631b65385a..881dd249cce6b73a0a97e83b6173383af844c3df 100644
(file)
--- a/
merge.tex
+++ b/
merge.tex
@@
-1,4
+1,5
@@
\section{Merge}
\section{Merge}
+\label{commit-merge}
Merge commits $L$ and $R$ using merge base $M$:
\gathbegin
Merge commits $L$ and $R$ using merge base $M$:
\gathbegin