summaryrefslogtreecommitdiff
path: root/merge-cache.c
AgeCommit message (Collapse)Author
2005-04-18Ass a "merge-cache" helper program to execute a merge onLinus Torvalds
any unmerged files. This one doesn't actually do the merging, but it makes it easy to script the programs that do using it.