Apparently the msys diff tool has internal logic to deal with this. CFEngine itself, however, does not.