Re: Rewriting bzrmerge.el

[David Engster]

Eli Zaretskii writes:
> What are the assumptions about the location of the release branch?  Do
> you assume the release branch is in the same cloned repo as master, or
> are there provisions for having the branch in another clone?

As long as you use git-new-workdir, that shouldn't matter. The 'trunk'
checkout should also have a local tracking branch
'emacs-24'. Alternatively, we could default to merge origin/emacs-24,
which wouldn't even require a local tracking branch.

-David