2011-11-01 If you are on a system with vim installed and you do a conflict- ing merge in mercurial, then you're put into gvimdiff. This is a simply horrible tool. First, it splits the screen in columns in- stead of rows. Who works on files with only 40 chars per line? Second, it's all colored. I know, there are people, who like colors, but for me, that's heavy overload. Third, the differ- ences, and thus the colors, are not updated properly. It starts with a ``Oh, not that thing again!'' feeling, then I start get- ting confused. This tools keeps me from being productive. It doesn't let me just do the merge. Okay, to cut it short: I don't want gvimdiff ever to appear again, no matter if it's available or not. A mercurial wiki page [0] provides solutions to this problem: A 99-line shell script, named hg-diff3-merge, and a 25-line simpler version, named hgmerge.sh. I like to propose 3 lines for the hgrc to do basically the same: [merge-tools] diff3-priority = 100 diff3-args = -m $local $base $other >$output Works for me. Btw: `hg resolve' should do `-m' (or `-l') as default, and the remerge with an additional switch. This is not the first time I was confused by this default. [0] http://mercurial.selenic.com/wiki/MergingManuallyInEditor http://marmaro.de/lue/ markus schnalke