summaryrefslogtreecommitdiff
path: root/merge-tree.c
Commit message (Expand)AuthorAgeFilesLines
* Add "merge-tree" helper program. Maybe it's retarded, maybe it's helpful.Linus Torvalds2005-04-141-0/+128