diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | 2005-04-19 11:16:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | 2005-04-19 11:16:12 -0700 |
| commit | ca016f0e4e7e508407fe17e121fcd520fbb7c865 (patch) | |
| tree | c5404b84a8df1badc32da2ba364f0485f4258e61 /commit-tree.c | |
| parent | 4aaef1064a1091ec38ab6adc823f26b82cf4998d (diff) | |
| download | git-ca016f0e4e7e508407fe17e121fcd520fbb7c865.tar.gz | |
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.
Diffstat (limited to 'commit-tree.c')
0 files changed, 0 insertions, 0 deletions