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
(0) -10000 -3000 -1000 -300 -100 -30 -10 -8 +8 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip