olved manually. When you
  are satisfied that the conflicts are resolved, issue the <code>fcm
  resolved</code> command on the file to remove the conflict status. (You will
  be prevented from committing if you have a conflicting file in your working
  copy.)</p>

  <p>If you have a conflicting MS Office 2003+ document, you may be able to
  take advantage of the <kbd>Tools &gt; Compare and Merge Documents</kbd>
  facility. Consider a working copy, which you have just updated from revision
  100 to revision 