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 hg update after a push, and I get this screen:

enter image description here

Help section says it's vim, how do I go about merging my application.

Edit
Report