rent
<a href="#def_branch">branch</a>.</p>
</dd>
<dt class="hdlist1"><a id="def_evil_merge"></a>evil merge</dt>
<dd>
<p>An evil merge is a <a href="#def_merge">merge</a> that introduces changes that
do not appear in any <a href="#def_parent">parent</a>.</p>
</dd>
<dt class="hdlist1"><a id="def_fast_forward"></a>fast-forward</dt>
<dd>
<p>A fast-forward is a special type of <a href="#def_merge">merge</a> where you have a
<a href="#def_revision">revision</a> and you are "merging" another
<a href="#def_branch">