title: Cannot edit code in netbeans when managing merge conflict in a file
body: <p>I'm working with Git and Netbeans. Both tools are awesome. I just have a small problem when trying to resolve merge conflict among a file:
  I cannot edit the code. I can only choose among the codes that are displayed in the merge conflicts resolver. But I would like to have more possibilities:
  - keep the changes from both file
  - adding changes to a file
  However, as I'm not allow to edit files in Netbeans, I cannot do this stuff. I think it's possible if I edit the file as a txt document with Notepad++. However I would rather stay in the Netbeans environnement.</p>
  
  <p>Thank you very much.</p>