Matt Mackall <mpm@selenic.com> [Sat, 05 Mar 2011 16:34:59 -0600] rev 13549
merge: drop resolve state for mergers with identical contents (issue2680)
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 22:13:36 +0100] rev 13548
merge with stable
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 22:03:30 +0100] rev 13547
hgweb: fix filelog rss links generation
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 22:03:18 +0100] rev 13546
hgweb: use tip in gitweb/monoblue filelog rss links (issue2677)
Mads Kiilerich <mads@kiilerich.com> [Sun, 06 Mar 2011 19:38:00 +0100] rev 13545
merge with stable
timeless <timeless@gmail.com> [Sun, 06 Mar 2011 10:27:07 -0600] rev 13544
cacert: improve error report when web.cacert file does not exist
timeless <timeless@gmail.com> [Sun, 06 Mar 2011 05:56:59 -0600] rev 13543
tests: improve hghave error reporting for missing Py OpenSSL
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 15:30:39 +0100] rev 13542
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 15:21:50 +0100] rev 13541
Improve unresolved merge conflicts warning (issue2681)
Suggested by Antoine Pitrou <pitrou@free.fr>
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 14:38:47 +0100] rev 13540
tests: convert test-serve to new format