[StavrosK]

Yes, I haven't used Mercurial too extensively (I use git), but Mercurial's commands make more sense to me. The only problem I have with it is that conflicts throw me into vim, and if I exit it to try and make sense of the merges, it thinks I'm done merging and leaves me in an unreasonable state, whereas git just marks the files and lets me resolve them at my leisure.

[RobAtticus]

Using "hg help merge-tools" it describes some different merge tool settings that you might fine helpful. For example if you want it to merge all files it can, and mark the ones it can't fully merge you can try "internal:merge".

To set it for your user globally, in your .hgrc put "merge=internal:merge" under [ui].

[StavrosK]

Fantastic, thank you.

[durin42]

You probably need to disable a merge tool. Check 'hg showconfig merge-tools' and you'll probably find something. If this is on a debian derived system, I think that package maintainer turns on a bunch of stuff by default, so you may need to find a file in /etc/hg or similar.

[hrydgard]

Not that I use hg anymore, but if I remember correctly, exiting vim with :cq (returning an error code) solves that.

[StavrosK]

That's very interesting to know in general, thank you.