title: Mercurial Diff Merge: What tool is this and how do I use it?
body: <p>I am new to mercurial, I am quite familiar with TortoiseHG, but this is the first time I am managing a project in a headless linux environment. I do an <code>hg update</code> after a push, and I get this screen:</p>
  
  <p><img src="https://i.stack.imgur.com/WNHq4.png" alt="enter image description here"></p>
  
  <p>Help section says it's vim, how do I go about merging my application.</p>