hg: updated merge tool and removed shelve