[galaxy-commits] commit/galaxy-central: Scott McManus: Fixing vimdiff errors.