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.
Use smerge minor mode in emacs to resolve conflicts.
The condition-case is used to suppress errors with emacs versions before 21.
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