h (without having to do any
    additional work to restore the branch).</dd>
  </dl>

  <h2 id="binary">Working with Binary Files</h2>

  <p>The <code>fcm conflicts</code> command and <code>xxdiff</code> can only
  help you resolve conflicts in text files. If you have binary files in your
  repository you need to consider whether conflicts in these files would cause
  a problem.</p>

  <h3 id="binary_conflicts">Resolving Conflicts in Binary Files</h3>

  <p>Conflicts in some types of binary files can be res