title: Git GUI merge resolution
body: <p>I have been trying to find tutorial on this but all I found is command based solution.</p>
  
  <p>So basically I am trying to revert to a previous version of my code, and the merge conflicts show up. I found myself have no way to resolve it.</p>
  
  <p>First of all, the GUI won't let me edit. </p>
  
  <p><a href="https://i.stack.imgur.com/0HzOJ.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/0HzOJ.png" alt="enter image description here"></a></p>
  
  <p>I can't type in the box. When installing Git, I use vim as default editor, but vim commands are not working!</p>
  
  <p>Secondly, when I right click on the text and click Run merge tool. A warning box shows up.</p>
  
  <p><a href="https://i.stack.imgur.com/c2zai.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/c2zai.png" alt="enter image description here"></a></p>
  
  <p>I installed Diffmerge and configured it.</p>
  
  <p>Any help will be appreciated! Thank you!</p>