X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=branch.h;h=064ee576f29764637dfdc62141973e935f8fd488;hb=86d87307c1c490282749e278380b9a258de0b46c;hp=6f38db14e9c496c55e204791e5ab0a5243186118;hpb=cf3269fba816d9b216b8b0d6e95ca6a345158de5;p=thirdparty%2Fgit.git

diff --git a/branch.h b/branch.h
index 6f38db14e9..064ee576f2 100644
--- a/branch.h
+++ b/branch.h
@@ -60,6 +60,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)