Mon, 27 Aug 2007 14:55:33 -0300 Merge with crew-stable.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 14:55:33 -0300] rev 5249
Merge with crew-stable.
Mon, 27 Aug 2007 02:21:58 -0300 Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 02:21:58 -0300] rev 5248
Merge with crew-stable
Sun, 26 Aug 2007 19:13:24 +0200 Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Aug 2007 19:13:24 +0200] rev 5247
Merge with crew-stable
Sun, 26 Aug 2007 16:49:26 +0200 Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Aug 2007 16:49:26 +0200] rev 5246
Merge with crew-stable
Sat, 25 Aug 2007 12:25:53 -0700 Improve extdiff configuration.
Brendan Cully <brendan@kublai.com> [Sat, 25 Aug 2007 12:25:53 -0700] rev 5245
Improve extdiff configuration. In addition to the old cmd.foo, opts.foo hgrc entries, allow a more simple alias = command [opts]... form. For example: [extdiff] cdiff = colordiff -uprN
Sat, 25 Aug 2007 16:31:37 +0200 cgi: sys.path.insert should be before importing mercurial
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 25 Aug 2007 16:31:37 +0200] rev 5244
cgi: sys.path.insert should be before importing mercurial thanks to R. Burke
Sat, 25 Aug 2007 11:30:59 +0200 merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 25 Aug 2007 11:30:59 +0200] rev 5243
merge with crew
Sat, 25 Aug 2007 11:30:11 +0200 improve error message for 'hg merge' when repo already at branchtip
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 25 Aug 2007 11:30:11 +0200] rev 5242
improve error message for 'hg merge' when repo already at branchtip
Thu, 23 Aug 2007 22:45:41 -0700 imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 22:45:41 -0700] rev 5241
imerge: add automerge flag to attempt to batch merge all conflicts
Thu, 23 Aug 2007 19:52:15 -0700 Merge with crew
Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 19:52:15 -0700] rev 5240
Merge with crew
(0) -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip