\newcommand{\pcy}{\pay{C}}
\newcommand{\pcn}{\pan{C}}
+\newcommand{\pd}{\pa{D}}
+\newcommand{\pdy}{\pay{D}}
+\newcommand{\pdn}{\pan{D}}
+
\newcommand{\pl}{\pa{L}}
\newcommand{\ply}{\pay{L}}
\newcommand{\pln}{\pan{L}}
\newcommand{\baseof}[1]{\base ( #1 ) }
\newcommand{\depsreqof}[1]{\depsreq ( #1 ) }
+\newcommand{\allpatches}{\Upsilon}
+\newcommand{\assign}{\leftarrow}
+%\newcommand{\assign}{' =}
+
\newcommand{\eqntag}[2]{ #2 \tag*{\mbox{#1}} }
\newcommand{\eqn}[2]{ #2 \tag*{\mbox{\bf #1}} }
\newcommand{\hasdep}{\succ}
\newcommand{\isdep}{\prec}
-\newcommand{\grefz}{ T^0 }
-\newcommand{\grefc}{ T }
-\newcommand{\grefu}{ T' }
-\newcommand{\greff}{ T^* }
+\newcommand{\tipz}{ T^0 }
+\newcommand{\tipc}{ T }
+\newcommand{\tipu}{ T' }
+\newcommand{\tipf}{ T^* }
-\newcommand{\grefza}[1]{ \grefz_{#1} }
-\newcommand{\grefca}[1]{ \grefc_{#1} }
-\newcommand{\grefua}[1]{ \grefu_{#1} }
-\newcommand{\greffa}[1]{ \greff_{#1} }
+\newcommand{\tipza}[1]{ \tipz_{#1} }
+\newcommand{\tipca}[1]{ \tipc_{#1} }
+\newcommand{\tipua}[1]{ \tipu_{#1} }
+\newcommand{\tipfa}[1]{ \tipf_{#1} }
-\newcommand{\grefzc}{ \grefza \pc }
-\newcommand{\grefcc}{ \grefca \pc }
-\newcommand{\grefuc}{ \grefua \pc }
-\newcommand{\greffc}{ \greffa \pc }
+\newcommand{\tipzc}{ \tipza \pc }
+\newcommand{\tipcc}{ \tipca \pc }
+\newcommand{\tipuc}{ \tipua \pc }
+\newcommand{\tipfc}{ \tipfa \pc }
%\newcommand{\bigforall}{\mathop{\hbox{\huge$\forall$}}}
\newcommand{\bigforall}{%
\input{anticommit.tex}
\input{merge.tex}
-\chapter{Merge strategy}
+\chapter{Update strategy}
\input{strategy.tex}