2 Commits (65bb49144d26a10837582a99e66041035319ff91)

Author SHA1 Message Date
Linus Torvalds e3b4be7f6c Change merge-cache and git-merge-one-file to use the SHA1 of the file 20 years ago
Linus Torvalds 75118b13bc Ass a "merge-cache" helper program to execute a merge on 20 years ago