commit - 2b92fad7804791e1a20f46acf637ff4c40470e50
commit + a8db5ed88e635d83d1cf9b7e9bbe48eea50c192c
blob - fdfbe63d3229efeafcbb07acd0ca22befe78d0cb
blob + 12aa9ccd65fa883e13a40a4a99de19bcb48a12dd
--- lib/worktree.c
+++ lib/worktree.c
struct merge_file_cb_arg {
struct got_worktree *worktree;
struct got_fileindex *fileindex;
- struct got_object_id *commit_id1;
- struct got_object_id *commit_id2;
got_worktree_checkout_cb progress_cb;
void *progress_arg;
got_worktree_cancel_cb cancel_cb;
arg.worktree = worktree;
arg.fileindex = fileindex;
- arg.commit_id1 = commit_id1;
- arg.commit_id2 = commit_id2;
arg.progress_cb = progress_cb;
arg.progress_arg = progress_arg;
arg.cancel_cb = cancel_cb;