Make "read-tree" know how to do a "1-way merge".
[git.git] / sha1_file.c
2005-04-18 Linus TorvaldsSplit up read-cache.c into more logical clumps.