title: What's the difference between vimdiff and vimdiff2 in git?
body: <p>What's the difference between them? My search engine results talk only about vimdiff, yet the command</p>
  
  <pre><code>git mergetool 
  </code></pre>
  
  <p>offers me both.</p>