summaryrefslogtreecommitdiff
path: root/merge-tree.c
AgeCommit message (Expand)AuthorFilesLines
2005-04-15[PATCH] Add '-z' to merge-tree.cLibravatar Junio C Hamano1-3/+20
2005-04-14Add "merge-tree" helper program. Maybe it's retarded, maybe it's helpful.Libravatar Linus Torvalds1-0/+128