Mercurial file conflicts resolution similar to Subversion behavior
Friday, January 8th, 2010For the impatient
Ok, here is what you have to do on your Ubuntu box:
$ sudo apt-get install rcs $ vim ~/.hgrc
… and put the following lines somewhere into your ~/.hgrc
[merge-tools] merge.priority = 100