3 Commits (a90588821ac9d3dafc4afa7ebe4e0bc48e9f77c9)

Author SHA1 Message Date
James Bottomley e2b6a9d0bf [PATCH] make file merging respect permissions 20 years ago
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