title: Hg extensions + merge tool on mac os x
body: <p>I am working on setup of my hg for django projects on my mac.</p>
  
  <p>I need to do two things :</p>
  
  <ul>
  <li>set some mechanism to save my password and use it whenever I use repo again </li>
  </ul>
  
  <p>I've tried to do that by adding <strong>keyring extension</strong> to my .hg/hgrc file like this :</p>
  
  <pre><code>[extensions]
  mercurial_keyring =
  </code></pre>
  
  <p>but it doesn't work. I am getting such an error :</p>
  
  <pre><code>*** failed to import extension mercurial_keyring: No module named mercurial_keyring
  </code></pre>
  
  <p>Should I install that extension with pip / easy_install before?</p>
  
  <p>Because on Windows using HgTortoise I modified my hgrd file, added those two lines and it works just fine. </p>
  
  <p>I thought it would do the work on mac os x as well.</p>
  
  <ul>
  <li>set some default merge-tool, which would be launched whenever I use <strong>hg merge</strong> command and there would be some confilicts to resolve</li>
  </ul>
  
  <p>How can I do that?</p>
  
  <p>Here is my current hg files configuration :</p>
  
  <p>~/.hgrc</p>
  
  <pre><code>[ui]
  username = johny bravo &lt;johny.bravo@gmail.com&gt;
  </code></pre>
  
  <p>.../myproject/.hg/hgrc</p>
  
  <pre><code>[paths]
  default = https://bitbucket.org/johnybravo/firstdjango
  
  [extensions]
  mercurial_keyring =
  </code></pre>
  
  <p>According to some tutorials and articles about hg I'd read before that should do the work.</p>
  
  <p>But doesn't work in my case.</p>
  
  <p>Btw. Is there any nice external merge tool for hg? Vimdiff is terrible for me...</p>
  
  <p>I also use SourceTree for version control sometimes, but it seems it doesn't contain any merge tool.</p>
  
  <p>Is there any tool that looks similar to SourceTree? ( nice, readable, colorful GUI ).</p>
  
  <p>A perfect merge-tool would be one compatibile both with SourceTree and hg merge from command line so I coulde use them alternately.</p>