diff options
Diffstat (limited to 'branch.h')
-rw-r--r-- | branch.h | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -61,6 +61,12 @@ int validate_branchname(const char *name, struct strbuf *ref); 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) */ |