Wed, 15 Aug 2007 16:09:50 -0500 remove unneeded imports of mdiff
Matt Mackall <mpm@selenic.com> [Wed, 15 Aug 2007 16:09:50 -0500] rev 5175
remove unneeded imports of mdiff
Wed, 15 Aug 2007 15:56:39 -0500 Merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 15 Aug 2007 15:56:39 -0500] rev 5174
Merge with stable
Wed, 15 Aug 2007 13:21:23 -0700 convert: hg: optionally create branches as clones
Brendan Cully <brendan@kublai.com> [Wed, 15 Aug 2007 13:21:23 -0700] rev 5173
convert: hg: optionally create branches as clones If convert.hg.clonebranches is set, branches will be created as clones of their parent revisions. All clones will be subdirectories of the destination path.
Wed, 15 Aug 2007 17:27:51 +0200 Use smerge minor mode in emacs to resolve conflicts.
Sascha Wilde <wilde@sha-bang.de> [Wed, 15 Aug 2007 17:27:51 +0200] rev 5172
Use smerge minor mode in emacs to resolve conflicts. The condition-case is used to suppress errors with emacs versions before 21.
Wed, 15 Aug 2007 16:43:40 +0200 Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Wed, 15 Aug 2007 16:43:40 +0200] rev 5171
Merge with crew-stable
Tue, 14 Aug 2007 21:36:08 +0200 merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 14 Aug 2007 21:36:08 +0200] rev 5170
merge with crew-stable
Tue, 14 Aug 2007 19:30:14 +0200 Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 19:30:14 +0200] rev 5169
Merge with crew-stable
Tue, 14 Aug 2007 19:06:10 +0200 Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 19:06:10 +0200] rev 5168
Merge with crew-stable
Tue, 14 Aug 2007 18:25:27 +0200 fix bundlerepo broken by 4205f626dc05
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 14 Aug 2007 18:25:27 +0200] rev 5167
fix bundlerepo broken by 4205f626dc05 since we now use struct in case of lazy parser, this have to be an integer instead of None see issue681
Tue, 14 Aug 2007 16:30:38 +0200 Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 16:30:38 +0200] rev 5166
Merge with crew-stable
(0) -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip