Commit Diff


commit - 05c019caa29a5bbe3b58ee98b9ce8e7f7d29a76a13c4a7ea8d649f4c87c4aceb
commit + 48ffe7559a94eb5c39cdaac6a1789b3b83b1e5fe6ac8907d375ce7f98df2baa0
blob - 0e54e9849439e83fd350131493c23782a55efbcd8c604751bf6c42dd40efa32b
blob + 04de1a83d724bfefbbcba78f82f035ee30e76ffbd90a0394097d48b8e29fe826
--- lib/worktree.c	
+++ lib/worktree.c	
@@ -3197,7 +3197,7 @@ merge_file_cb(void *arg, struct got_blob_object *blob1
 			 * exists in the repository.
 			 */
 			err = got_object_blob_file_create(&id, &blob1_f,
-			    &blob1_size, path1, repo);
+			    &blob1_size, ondisk_path, repo);
 			if (err)
 				goto done;
 			if (fclose(blob1_f) == EOF) {
@@ -3239,7 +3239,7 @@ merge_file_cb(void *arg, struct got_blob_object *blob1
 			 * on disk. No content will be lost in either case.
 			 */
 			err = got_object_blob_file_create(&id, &blob1_f,
-			    &blob1_size, path1, repo);
+			    &blob1_size, ondisk_path, repo);
 			if (err) {
 				if (err->code == GOT_ERR_ERRNO &&
 				    (errno == ENOENT || errno == ENOTDIR)) {