title: Using KDiff3 to edit diffs with Git
body: <p>Often when I do diffs I want to edit my local file before committing. This works very well in Eclipse's compare view as it allows you to easily edit the local file as well as copy changes from the previous version.</p>
  
  <p>I am trying to set up Git and KDiff3 to work the same way. It works as expected when I'm using KDiff3 as my mergetool. However when I set it up as the difftool, it gives me a read-only view, so I can't do any edits. According to the documentation (<a href="http://kdiff3.sourceforge.net/doc/documentation.html" rel="nofollow noreferrer">http://kdiff3.sourceforge.net/doc/documentation.html</a>), I would expect the <code>--output</code> option to give me the two file merge I want, but it does not. The relevant part of my .gitconfig:</p>
  
  <pre><code>[diff]
    tool = kdiff3
  [difftool "kdiff3"]
    cmd = /Applications/kdiff3.app/Contents/MacOS/kdiff3 $LOCAL $REMOTE --output $LOCAL
    trustExitCode = false
  </code></pre>