Change merge-cache and git-merge-one-file to use the SHA1 of the file
instead of a checked-out temporary copy. If merging requires a checked-out-copy, we now do so with "unpack-file".
Showing
想要评论请 注册 或 登录
instead of a checked-out temporary copy. If merging requires a checked-out-copy, we now do so with "unpack-file".