1 Commits

Author	SHA1	Message	Date
Linus Torvalds	75118b13bc	Ass a "merge-cache" helper program to execute a merge on ... any unmerged files. This one doesn't actually do the merging, but it makes it easy to script the programs that do using it.	2005-04-17 19:52:54 -07:00