| commit | 2fbdd1317480d2f14756d94e41a8eb07442d4841 | |
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Sat, 16 Apr 2005 19:24:12 +0000 (16 12:24 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Sat, 16 Apr 2005 19:24:12 +0000 (16 12:24 -0700) | ||
| tree | a851ce1b68aad8616fd4eed75dc02c3de77b4802 | treesnapshot (tar.gz zip) |
| parent | 7b937ca33142ff5ecc655f2be61678a512352122 | commitdiff |
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.
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.
| Makefile | diffblobblamehistory | |
| merge-tree.c | [deleted file] | blobblamehistory |