commit 49b650bb078a73e7a05703caa4e47cdae61ae1fe
from: Sven M. Hallberg <pesco@khjk.org>
date: Sat Aug 03 11:17:42 2024 UTC

fix argument name in header declaration

commit - a9da0816e28f2d7d6dbd3582ce02214e5c772501
commit + 49b650bb078a73e7a05703caa4e47cdae61ae1fe
blob - 01bbc9dc9ef3289c00fa880bba8f79aa56f756af
blob + 6801a4bd92ef6dec2d02f8dd54a39617c1b5845e
--- include/got_worktree.h
+++ include/got_worktree.h
@@ -500,7 +500,7 @@ got_worktree_merge_branch(struct got_worktree *worktre
 const struct got_error *
 got_worktree_merge_commit(struct got_object_id **new_commit_id,
     struct got_worktree *worktree, struct got_fileindex *fileindex,
-    const char *author, time_t author_ts, const char *committer,
+    const char *author, time_t author_time, const char *committer,
     int allow_bad_symlinks, struct got_object_id *branch_tip,
     const char *branch_name, int allow_conflict, struct got_repository *repo,
     got_worktree_status_cb status_cb, void *status_arg);