emacs-devel
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: merging emacs-24

From: Stefan Monnier
Subject: Re: merging emacs-24
Date: Fri, 28 Nov 2014 09:29:38 -0500
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) 
> perfect job.  AFAICS, gitmerge.el doesn't fix that (maybe it should
> try), so manual labor is still required.

I haven't checked gitmerge.el, but bzrmerge.el had special code to do
the ChangeLog merge, and at some point at least it did it better (or at
least, more closely to our conventions) than Bzr's
"changelog-merge" plugin.


        Stefan
reply via email to
[Prev in Thread] Current Thread [Next in Thread]