Hg: use conflict markers instead of vimdiff