commit 3c24af982ca3c4e92e4811979d4f4dedebad7f69
from: Tracey Emery <tracey@traceyemery.net>
date: Fri Feb 07 21:06:03 2020 UTC

fix segfault in got backout which include deleted files

commit - 74283ab8e59cdc12bc4adb3d2037f37df510bf1f
commit + 3c24af982ca3c4e92e4811979d4f4dedebad7f69
blob - 17a07a2e89038439f7620a85b41050549a954ea8
blob + 86333ed330f408d057d9d8d3b52a016f28de4cb9
--- lib/worktree.c
+++ lib/worktree.c
@@ -2110,7 +2110,7 @@ merge_file_cb(void *arg, struct got_blob_object *blob1
 		    strlen(path1));
 		if (ie == NULL)
 			return (*a->progress_cb)(a->progress_arg,
-			    GOT_STATUS_MISSING, path2);
+			    GOT_STATUS_MISSING, path1);
 
 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
 		    path1) == -1)