# HG changeset patch # User Jordi GutiƩrrez Hermoso # Date 1394379590 14400 # Node ID c657209f840b760f51907ebbdd4b6a251eadd267 # Parent 389af285236faf0c41841e4b699459e05521147e Minor rewordings diff -r 389af285236f -r c657209f840b talk.tex --- a/talk.tex Sun Mar 09 11:39:35 2014 -0400 +++ b/talk.tex Sun Mar 09 11:39:50 2014 -0400 @@ -25,7 +25,7 @@ \title{Changeset Evolution in Mercurial} -\subtitle{Edit commits collaboratively!} +\subtitle{Edit commits as a team!} \date{} %%% END METADATA%%% @@ -200,7 +200,7 @@ \item Basically, automatically fixes any problems \item - Rebases back to upstream and more! + recovers from upstream rebase (solves Problem 1) \end{itemize} \end{center} \end{frame} @@ -222,7 +222,7 @@ \begin{frame} \begin{center} - Let's see evolve in action! + Let's see Evolve in action! \fontsize{68}{80}\selectfont \lefthand \end{center}