[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Merging emacs-25 into master
|
From: |
Stefan Monnier |
|
Subject: |
Merging emacs-25 into master |
|
Date: |
Fri, 25 Dec 2015 23:35:14 -0500 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) |
I just tried to merge from emacs-25 to master, via gitmerge.el.
Just to let you know that this sucked, and after fixing a few obvious
problems by hand and finally bumping into assertion errors, I simply
gave up in disgust.
It's not healthy to wait that long before performing such merges.
Good luck, tho,
Stefan
- Merging emacs-25 into master,
Stefan Monnier <=