Absent significant bug reports, I am going to move up the merge date to this coming Wednesday, November 18. Please continue your testing.
Leo's code base isn't going back. It will definitely be based on the new code in ekr-undo, regardless of temporary problems. I don't expect any serious problems. I have been happily eating my own dog food for several days.
Edward