title: The VS Merge tool merge result is awful
body: <p>Earlier today I tried to merge branches in the project and found really awful merge result from the built-in merge tool into VS2015, although the compare tool works perfectly and shows me only the changes in the code, not the whole blocks, which I can't merge easily in 'two clicks'. 
  Here are two screenshots, from the merge tool and the compare tool, as you can see the difference is enormous. 
  I tried did merge from the VS and the SourceTree tool - the same result. 
  That is a bug or something else? How I can change something? Sometimes merging like that, which is very simple, takes a lot of time to merge by hand.
  <a href="https://bdfss.blob.core.windows.net/shots/2017-04-05_15-30-08-5157fe21-cfd1-473e-947b-4d4e20f21748.png" rel="nofollow noreferrer"><img src="https://bdfss.blob.core.windows.net/shots/2017-04-05_15-30-08-5157fe21-cfd1-473e-947b-4d4e20f21748.png" alt="the result from the compare tool"></a>
  <a href="https://bdfss.blob.core.windows.net/shots/2017-04-05_15-30-18-8cf50bc4-07a4-4226-badb-1751ef3d5626.png" rel="nofollow noreferrer"><img src="https://bdfss.blob.core.windows.net/shots/2017-04-05_15-30-18-8cf50bc4-07a4-4226-badb-1751ef3d5626.png" alt="the result from the merge tool"></a></p>