Don't allow --style and --template for hg update and hg merge.
The only way that changesets will be shown with these command is in an error
message when trying to update to an ambiguous branch name.
adding fooadding bombadding a.cadding dir/a.oadding dir/b.o! a.c! dir/a.o! dir/b.o? .hgignorea.c: unsupported file type (type is fifo)! a.c