Mon, 07 Mar 2011 15:03:10 -0600 |
Matt Mackall |
merge: back out single-parent fast-forward merge
stable
|
Sat, 05 Mar 2011 16:34:59 -0600 |
Matt Mackall |
merge: drop resolve state for mergers with identical contents (issue2680)
stable
|
Sun, 06 Mar 2011 22:13:36 +0100 |
Patrick Mezard |
merge with stable
|
Sun, 06 Mar 2011 22:03:30 +0100 |
Patrick Mezard |
hgweb: fix filelog rss links generation
stable
|
Sun, 06 Mar 2011 22:03:18 +0100 |
Patrick Mezard |
hgweb: use tip in gitweb/monoblue filelog rss links (issue2677)
stable
|
Sun, 06 Mar 2011 19:38:00 +0100 |
Mads Kiilerich |
merge with stable
|
Sun, 06 Mar 2011 10:27:07 -0600 |
timeless |
cacert: improve error report when web.cacert file does not exist
stable
|
Sun, 06 Mar 2011 05:56:59 -0600 |
timeless |
tests: improve hghave error reporting for missing Py OpenSSL
stable
|
Sun, 06 Mar 2011 15:30:39 +0100 |
Patrick Mezard |
Merge with stable
|
Sun, 06 Mar 2011 15:21:50 +0100 |
Patrick Mezard |
Improve unresolved merge conflicts warning (issue2681)
stable
|
Sun, 06 Mar 2011 14:38:47 +0100 |
Patrick Mezard |
tests: convert test-serve to new format
|
Sun, 06 Mar 2011 14:19:57 +0100 |
Patrick Mezard |
run-tests: handle mixed comment lines in blacklists
|
Sun, 06 Mar 2011 14:17:47 +0100 |
Patrick Mezard |
test-doctest: handle unix/windows path discrepancies
|
Sun, 06 Mar 2011 10:06:09 +0100 |
Patrick Mezard |
test-rename-merge1: make it easier to review, windows friendly
|
Sat, 05 Mar 2011 16:34:59 -0600 |
Matt Mackall |
merge: drop resolve state for mergers with identical contents (issue2680)
|
Fri, 04 Mar 2011 19:21:36 -0600 |
Matt Mackall |
merge with stable
|