![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Sat, 16 Apr 2005 16:11:49 +0000 (09:11 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Sat, 16 Apr 2005 16:11:49 +0000 (09:11 -0700) | ||
| commit | 43f91266a493c4888b4ff2a7997ccc4a381e7238 | |
| tree | 26f176413928139d69d2249c78f24d7be4b0d9fd | tree | snapshot |
| parent | aee461985f52857fa04999b2a988986dd8c84aba | commit | diff |
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.
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.
| read-tree.c | diff | blob | history |