Added merge tool config to hgrc