| commit | ca016f0e4e7e508407fe17e121fcd520fbb7c865 | |
| author | Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | |
| Tue, 19 Apr 2005 18:16:12 +0000 (19 11:16 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | |
| Tue, 19 Apr 2005 18:16:12 +0000 (19 11:16 -0700) | ||
| tree | c5404b84a8df1badc32da2ba364f0485f4258e61 | treesnapshot (tar.gz zip) |
| parent | 4aaef1064a1091ec38ab6adc823f26b82cf4998d | commitdiff |
Make "read-tree" take the 'stat' information for a merge result from the
old index state if the result matches.
This leaves the stat information in the result tree for any trivial
merges, which is just the way we like it.
old index state if the result matches.
This leaves the stat information in the result tree for any trivial
merges, which is just the way we like it.
| read-tree.c | diffblobblamehistory |