Fri, 17 Sep 2010 12:45:13 -0500 Merge with stable
Steve Borho <steve@borho.org> [Fri, 17 Sep 2010 12:45:13 -0500] rev 12318
Merge with stable
Fri, 17 Sep 2010 12:44:35 -0500 test-eol-update: record new results as correct stable
Steve Borho <steve@borho.org> [Fri, 17 Sep 2010 12:44:35 -0500] rev 12317
test-eol-update: record new results as correct Changeset 0852da25a31b changed the result of this test. The 'hg update 0' command, which causes a merge of modified a.txt, now leaves a.txt in the EOLN format specified by .hgeol as it was committed in revision 0. Previously, it used the .hgeol contents from the working directory before the update.
Thu, 16 Sep 2010 17:51:32 -0500 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com> [Thu, 16 Sep 2010 17:51:32 -0500] rev 12316
tests: add exit codes to unified tests
Thu, 16 Sep 2010 16:12:26 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 16 Sep 2010 16:12:26 -0500] rev 12315
merge with stable
(0) -10000 -3000 -1000 -300 -100 -30 -10 -4 +4 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip