summaryrefslogtreecommitdiff
path: root/merge-tree.c
AgeCommit message (Expand)Author
2005-04-14Add "merge-tree" helper program. Maybe it's retarded, maybe it's helpful.Linus Torvalds