title: Git Interactive Merge?
body: <p>I have two branches with the exact same file (incase you are wondering it is a .sql file) and I want to interactively merge it.</p>
  
  <p>Pretty much I want to open up a diff program like I do when there is a conflict (or command line) and select exactly what lines go where.</p>
  
  <p>Is there anyway to do this?</p>