title: git diff with parent 1 - 2
body: <p>I was looking at the log in Tortoise, and this message is there
  Commit:ab77ac9ca5264c531586ad9c5f007395d3e7ae9b</p>
  
  <ul>
  <li>Merge branch 'master' of repo:R:/AAL/dotNET/OPDash</li>
  </ul>
  
  <p>and also "Diff with parent 1" and "Diff with parent 2" not sure what I should do.</p>
  
  <p>Should I just run the merge option in Tortoise?</p>