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