hgmerge: various cleanups Details: - put temporary file names into variables - make all temporary file names end with random part - cleanup FileMerge handling - do not use hardlinks in FileMerge change test (breaks on FAT) - try harder to keep file mtime unchanged in case of failed merge

     1

Content-type: text/xml

     2

     3

<rss version="2.0">

     4

  <channel>

     5

    <link>#url#</link>

     6

    <language>en-us</language>