|
| From: | Paul Eggert |
| Subject: | Re: merging emacs-24 |
| Date: | Fri, 28 Nov 2014 23:20:54 -0800 |
| User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 |
Ted Zlatanov wrote:
it's only going to get harder to revert my "stupid" commit as more commits pile on
I attempted to finish up the merge, and bring it up to date with the latest master and emacs-24 branches, without reverting anything (in the git sense), as git commit 0cce3623b169732a51f055a86fc926313b11a5ee on the master branch. I did this by hand. Please let me know of any errors.
| [Prev in Thread] | Current Thread | [Next in Thread] |