title: egit merge tool disabled
body: <p>I have recently installed eclipse indigo and egit V1.3 and configured my project in it. I am unable to use the Team->Merge Tool as per the documentation in <a href="http://wiki.eclipse.org/EGit/User_Guide#Using_Merge_Tool" rel="noreferrer">http://wiki.eclipse.org/EGit/User_Guide#Using_Merge_Tool</a> in case of conflicts. The Merge Tool option is disabled. A search in google points me to <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=339092" rel="noreferrer">https://bugs.eclipse.org/bugs/show_bug.cgi?id=339092</a>, but looks like this bug has been resolved in the new version. Is there something else I need to configure ?</p>
  
  <p>I am directly working on the master branch. Am I missing something ?</p>