Move make_cache_entry() from merge-recursive.c into read-cache.c