Commit 14c901f1f8f27565b91c2e8a74939c74250d8521

Stefan Sperling 2019-08-08T09:25:49

split up worktree.c's merge_blob() into merge_blob() and merge_file()