Showing posts with label error. Show all posts
Showing posts with label error. Show all posts

Tuesday, June 12, 2012

How to fix hg error "no tool found to merge"

Hello.

Sometimes merging your changes with changes of other people you may encounter a problem when hg cannot merge a file and displays the following error:

This often happens with binary files, but if it happens with a text file, you are in trouble, because you definitely do not want to merge big files by yourself.
Under the cut I'll show a simple solution for this.