| commit | a3a65234dba0f90a0b8e06fa7b5f269fe5126761 | |
| author | Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | |
| Tue, 19 Apr 2005 18:41:18 +0000 (19 11:41 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | |
| Tue, 19 Apr 2005 18:41:18 +0000 (19 11:41 -0700) | ||
| tree | 7315346f212d77d19f8c7c2fc82c5beda21e4a95 | treesnapshot (tar.gz zip) |
| parent | ca016f0e4e7e508407fe17e121fcd520fbb7c865 | commitdiff |
Make "read-tree" know how to do a "1-way merge".
This one just reads one tree, but picks up any matching stat information
from the old index.
This one just reads one tree, but picks up any matching stat information
from the old index.
| read-tree.c | diffblobblamehistory |