Sun, 06 Mar 2011 15:30:39 +0100 Merge with stable
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 15:30:39 +0100] rev 13542
Merge with stable
Sun, 06 Mar 2011 15:21:50 +0100 Improve unresolved merge conflicts warning (issue2681) 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>
Sun, 06 Mar 2011 14:38:47 +0100 tests: convert test-serve to new format
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 14:38:47 +0100] rev 13540
tests: convert test-serve to new format
Sun, 06 Mar 2011 14:19:57 +0100 run-tests: handle mixed comment lines in blacklists
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 14:19:57 +0100] rev 13539
run-tests: handle mixed comment lines in blacklists
Sun, 06 Mar 2011 14:17:47 +0100 test-doctest: handle unix/windows path discrepancies
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 14:17:47 +0100] rev 13538
test-doctest: handle unix/windows path discrepancies
Sun, 06 Mar 2011 10:06:09 +0100 test-rename-merge1: make it easier to review, windows friendly
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 10:06:09 +0100] rev 13537
test-rename-merge1: make it easier to review, windows friendly - Reuse the coding style of the previous tests, both are very similar - Do not play with case changes, it does not work on Windows
Sat, 05 Mar 2011 16:34:59 -0600 merge: drop resolve state for mergers with identical contents (issue2680)
Matt Mackall <mpm@selenic.com> [Sat, 05 Mar 2011 16:34:59 -0600] rev 13536
merge: drop resolve state for mergers with identical contents (issue2680)
Fri, 04 Mar 2011 19:21:36 -0600 merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 04 Mar 2011 19:21:36 -0600] rev 13535
merge with stable
(0) -10000 -3000 -1000 -300 -100 -30 -10 -8 +8 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip