Commit 5dffb1a14a4e706b322f648797d0fea44e684aa8
2022-07-02T21:08:31
got patch: don't loose the x bit when merging with diff3 This fixes a regression introduced with the diff3 merge: files merged this way have their permissions resetted after patch. The issue is due the fact that patch_file looks at a temporary files and not at the original "old file". Reported by and ok stsp@