make --style=compact look for map-cmdline.compact. change name of key in map file from changelog to changeset. rename command map files to start with map-cmdline. rename ui.logmap to ui.style in hgrc. now --style=foo does this: tries to open foo as file. tries as map-cmdline.foo in template path. tries as foo in template path.

     1

merge: warning: conflicts during merge

     2

merging a

     3

merging a failed!

     4

32e80765d7fe+75234512624c+ tip

     5

something else

     6

=======

     7

something

     8

M a