title: Is the default merge tool in TFS 2012 three-way or two-way?
body: <p>We are using Team Foundation Server - TFS 2012 and have TFVC set as the version control. I would like to know whether the default merge tool uses a three-way, or a two-way merging method?</p>
  <p>If it uses a three-way method then how different is it from the merging used in Git ?</p>