hgweb: shorten all the URLs in the standard templates A URL like this: http://www.selenic.com/hg/?cmd=changeset;node=5010207c35273ac1331cae44c253dd41fa07cb7f is now presented as: http://www.selenic.com/hg/?cs=5010207c352 (though the old style still works, of course)

     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