travis: back to real test

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
remote-hg: fix hg merge

Let's specify a merge tool, otherwise mercurial might open one.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
remote-helpers: remove test info

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
remote-hg: remove simple test

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>