summaryrefslogtreecommitdiff
path: root/merge-cache.c
AgeCommit message (Expand)Author
2005-04-18Change merge-cache and git-merge-one-file to use the SHA1 of the fileLinus Torvalds
2005-04-18Ass a "merge-cache" helper program to execute a merge onLinus Torvalds