diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 12:24:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 12:24:12 -0700 |
| commit | 2fbdd1317480d2f14756d94e41a8eb07442d4841 (patch) | |
| tree | a851ce1b68aad8616fd4eed75dc02c3de77b4802 /ls-tree.c | |
| parent | 7b937ca33142ff5ecc655f2be61678a512352122 (diff) | |
| download | git-2fbdd1317480d2f14756d94e41a8eb07442d4841.tar.gz | |
Remove "merge-tree.c"
It's there in the history if somebody wants to resurrect it, but it
seems to have been successfully superceded by the new and improved
index-merge thing, where we do all merging entirely in the index.
Diffstat (limited to 'ls-tree.c')
0 files changed, 0 insertions, 0 deletions