Make diffTocs() return all file versions w status
Add TEMPORARY code to throw if try to start conflicted merge