changeset 254:33b6c73e487e

Conclusion for vendor branches
author Martin Geisler <mg@lazybytes.net>
date Sun, 21 Nov 2010 21:22:57 +0100
parents 6839cd949165
children b100f5e05c28
files conclusion-branches.tex vendor-branches.tex
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
new file mode 100644
--- /dev/null
+++ b/conclusion-branches.tex
@@ -0,0 +1,7 @@
+\begin{frame}{Conclusion}
+  Mercurial can help manage vendor branches:
+  \begin{itemize}
+  \item simple workflow
+  \item relies on every-day merge techniques
+  \end{itemize}
+\end{frame}
--- a/vendor-branches.tex
+++ b/vendor-branches.tex
@@ -62,6 +62,7 @@
 
 \section{Wrapping Up}
 
+\include{conclusion-branches}
 \include{links}
 \include{contact}
 \include{contributors}