merge-ff.tex

\input{common.tex}
\begin{document}
\begin{tikzpicture}[main]
    \boundingbox
    \usualsetup
    \refbelow [branch] "master" : master -> E;
    \oldbranch maint -> A;
    \branch maint -> E;
    \oldHEAD -> old maint;
    \HEAD -> maint;

    \node [cmd] at (0, 3.75) {git merge master};

    \path [line]
        (E) edge [bend right=5] (index.north east)
        (E) edge [bend right=15] (work.north east)
        (old HEAD) edge [dashed, bend left=10] (HEAD)
        ;

\end{tikzpicture}
\end{document}