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.

%% no changes
%% no changes
%% uncompressed contents in repo
this is a test
%% uncompress our working dir copy
this is a test
%% uncompress our new working dir copy
this is a test