commit 960094b4eff0069984143900870f8486dbe0a08d
from: Stefan Sperling <stsp@stsp.name>
date: Thu Jul 23 14:22:34 2020 UTC

resolve an XXX remark in merge_file_cb()

commit - d219f183308acdda359bff4261e6ff7cd249670f
commit + 960094b4eff0069984143900870f8486dbe0a08d
blob - c1f8b7e0a389560c5e75a5dc3fe63cde1537df33
blob + f7a518701e3aaaf962ce345785d00465bb4418ff
--- lib/worktree.c
+++ lib/worktree.c
@@ -2744,9 +2744,7 @@ merge_file_cb(void *arg, struct got_blob_object *blob1
 		} else {
 			sb.st_mode = GOT_DEFAULT_FILE_MODE;
 			err = install_blob(a->worktree, ondisk_path, path2,
-			    /* XXX get this from parent tree! */
-			    GOT_DEFAULT_FILE_MODE,
-			    sb.st_mode, blob2, 0, 0, 0, repo,
+			    mode2, sb.st_mode, blob2, 0, 0, 0, repo,
 			    a->progress_cb, a->progress_arg);
 			if (err)
 				goto done;