*/
int validate_new_branchname(const char *name, struct strbuf *ref, int force);
+/*
+ * Remove information about the merge state on the current
+ * branch. (E.g., MERGE_HEAD)
+ */
+void remove_merge_branch_state(struct repository *r);
+
/*
* Remove information about the state of working on the current
* branch. (E.g., MERGE_HEAD)
* otherwise.
*/
int replace_each_worktree_head_symref(const char *oldref, const char *newref,
- const char *logmsg);
+ const char *logmsg);
#endif