Plus it is the case with hg (but I guess also with git) that you can use any merge tool to merge your files. Once someone write such a tool, everyone profit! (

Plus it is the case with hg (but I guess also with git) that you can use any merge tool to merge your files. Once someone write such a tool, everyone profit! (My understanding is that it happens too rarely in practice to make it worth the effort)