 are <em>not</em>
registered in your index file, so <code>git diff</code> would show you what
changes you made since the tip of the new branch.</p>
</div>
</li>
<li>
<p>When a merge conflict happens during switching branches with
the <code>-m</code> option, you would see something like this:</p>
<div class="listingblock">
<div class="content">
<pre>$ git checkout -m mytopic
Auto-merging frotz
ERROR: Merge conflict in frotz
fatal: merge program failed</pre>
</div>
</div>
<div class="paragraph">
<p>At this po