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.

     1

adding foo

     2

adding bomb

     3

adding a.c

     4

adding dir/a.o

     5

adding dir/b.o

     6

! a.c

     7

! dir/a.o

     8

! dir/b.o

     9

? .hgignore

    10

a.c: unsupported file type (type is fifo)

    11

! a.c