Oh. Why am I messing about with Winmerge? Overcome with optimism, I installed the short/split category description module, and then copied the new files over.