summaryrefslogtreecommitdiff
path: root/merge-cache.c
AgeCommit message (Expand)Author
2005-04-18Ass a "merge-cache" helper program to execute a merge onLinus Torvalds