title: How can I configure sdiff as a merge tool for git?
body: <p>I am still looking for a good command line (<strong>no GUI</strong>) git merge tool as I do not know vim or emacs. I found the following on <a href="http://www.chemie.fu-berlin.de/chemnet/use/info/diff/diff_9.html" rel="nofollow">how to use sdiff for merging</a>, which seems pretty simple.</p>
  
  <p>I cannot seem to make sdiff work properly. I currently have the following in my .gitconfig file, but <code>git mergetool</code> complains that <code>git config option merge.tool set to unknown tool: sdiff</code>.</p>
  
  <pre><code>[merge]
          conflictstyle = diff3
          tool = sdiff
  [mergetool "sdiff"]
          path = /usr/bin/sdiff
  </code></pre>
  
  <p>With <code>cmd = sdiff $LOCAL $REMOTE</code> in .gitconfig when I try <code>git mergetool</code> I do not get the chance to edit anything but get the message <code>Was the merge successful? [y/n]</code> right away.</p>
  
  <p>What is the correct configuration to make sdiff work as a merge tool for git? Alternatively, if you know of a better command-line tool that does not have a steep learning curve, I would like to know.</p>
  
  <p><strong>Edit</strong>: here is what I get when I run git mergetool:</p>
  
  <pre><code>Merging:
  [list of files]
  
  Normal merge conflict for 'xx/yy/zz.php':
    {local}: modified file
    {remote}: modified file
  Hit return to start merge resolution tool (sdiff):
  
  [Split screen of both versions]
  
  xx/yy/zz.php seems unchanged.
  Was the merge successful? [y/n]
  </code></pre>