Re: merging emacs-24

[Ted Zlatanov]

On Thu, 27 Nov 2014 23:24:45 +0100 David Engster <address@hidden> wrote: 

DE> Stefan Monnier writes:
>>> You'll have to checkout master if you want to merge into it, so I did
>>> not see the point putting it into emacs-24. If you feel strongly about
>>> it, I can backport it.
>> 
>> No, it's fine on master, thanks.

DE> I've also added some documentation in admin/notes/git-workflow.

I think gitmerge.el is really clever :)  I learned a lot reading it.

One request: maybe it could log what it does, especially the shell
commands, a little better.

Ted