summaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 16:11:49 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 16:11:49 (GMT)
commit43f91266a493c4888b4ff2a7997ccc4a381e7238 (patch)
tree26f176413928139d69d2249c78f24d7be4b0d9fd /read-cache.c
parentaee461985f52857fa04999b2a988986dd8c84aba (diff)
downloadgit-43f91266a493c4888b4ff2a7997ccc4a381e7238.zip
git-43f91266a493c4888b4ff2a7997ccc4a381e7238.tar.gz
git-43f91266a493c4888b4ff2a7997ccc4a381e7238.tar.bz2
Make 'read-tree' do a few more of the trivial merge cases.
This cuts down the work for the "real merge" to stuff where people might actually disagree on the algorithm. The trivial cases would seem to be totally independent of any policy.
Diffstat (limited to 'read-cache.c')
0 files changed, 0 insertions, 0 deletions