[Python-checkins] [Python-Dev] FIXED: I broke the 3.5 branch, apparently

[Terry Reedy]

On 6/3/2016 7:12 PM, Terry Reedy wrote:

> There is still a merge needed,
done

> something that deleted most of idlelib and some other files and changed
> 100s of others.  I am still trying to figure out what is what for idlelib.

It appears that the only thing that got a bit messed up were pending 
changes in my 3.5 working directory, but I had saved a diff, so I 
reverted and applied the diff.